Skip to content

Stable/mitaka #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
toby82 wants to merge 16 commits into from
+125 −160
Closed

Stable/mitaka #99

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3519faa
update references for stable/mitaka
sdague Mar 22, 2016
0206488
update max microversions for mitaka
sdague Mar 22, 2016
4953b04
Add colorful PS4
sdague Mar 21, 2016
3cff013
run swift blocks if any services are enabled
sdague Mar 25, 2016
603fc0c
Add dependency for hexdump
kramvan1 Mar 17, 2016
0945f43
Handle common and seperate tempest tox venvs
mtreinish May 2, 2016
95cb2ea
Remove vpnaas code from devstack
Apr 28, 2016
3e5b495
Use common tempest tox venv and add plugin install variable
mtreinish May 4, 2016
1d4303d
Merge "Remove vpnaas code from devstack" into stable/mitaka
May 11, 2016
ea04618
Fix ironic compute_driver name
jumpojoy Apr 26, 2016
d662cfa
Default to venv isolated tempest on stable mitaka
mtreinish May 3, 2016
23f5d5c
In worlddump, cover all supported version of OpenFlow protocol by ovs…
fkakuma Mar 8, 2016
0fbd81b
Merge "Fix ironic compute_driver name" into stable/mitaka
May 23, 2016
db0e962
Merge "Default to venv isolated tempest on stable mitaka" into stable…
May 25, 2016
a95ffa1
In worlddump, execute ovs-ofctl for an only existing bridge
fkakuma Apr 6, 2016
0181c48
Fix ovs-vsctl executed in worlddump.py failed issue
yanheven Apr 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
In worlddump, execute ovs-ofctl for an only existing bridge 
When devstack fails, some or all bridges may not exist.
This change allows an only existing bridge to executes ovs-ofctl command.
And fix duplicate ofp version specified in protocol option of ovs-ofctl.

Change-Id: Ied01de727ca9b867ce87db358f72ae44838b63af
(cherry picked from commit 578459f)
  • Loading branch information
@fkakuma
fkakuma committed May 28, 2016
commit a95ffa1c0b0cef065a3093bd1bf9dfc4e01ecf2e
13 changes: 8 additions & 5 deletions tools/worlddump.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ def _header(name):
print


def _bridge_list():
process = subprocess.Popen(['ovs-vsctl', 'list-br'], stdout=subprocess.PIPE)
stdout, _ = process.communicate()
return stdout.split()


# This method gets a max openflow version supported by openvswitch.
# For example 'ovs-ofctl --version' displays the following:
#
Expand Down Expand Up @@ -157,14 +163,11 @@ def ovs_dump():
if not _find_cmd('ovs-vsctl'):
return

# NOTE(ihrachys): worlddump is used outside of devstack context (f.e. in
# grenade), so there is no single place to determine the bridge names from.
# Hardcode for now.
bridges = ('br-int', 'br-tun', 'br-ex')
bridges = _bridge_list()
ofctl_cmds = ('show', 'dump-ports-desc', 'dump-ports', 'dump-flows')
ofp_max = _get_ofp_version()
vers = 'OpenFlow10'
for i in range(ofp_max + 1):
for i in range(1, ofp_max + 1):
vers += ',OpenFlow1' + str(i)
_dump_cmd("sudo ovs-vsctl show")
for ofctl_cmd in ofctl_cmds:
Expand Down