neutron

Merge lp:~bgh/neutron/ovs-readme into lp:neutron/diablo

  1. ovs-readme
  2. Merge into diablo
Proposed by Brad Hall
Status: Merged
Merged at revision: 78
Proposed branch: lp:~bgh/neutron/ovs-readme
Merge into: lp:neutron/diablo
Diff against target: 126 lines (+29/-11)
5 files modified
quantum/api/networks.py (+3/-2)
quantum/api/ports.py (+3/-2)
quantum/plugins/cisco/tests/unit/test_cisco_extension.py (+5/-5)
quantum/plugins/openvswitch/README (+16/-0)
tests/unit/test_api.py (+2/-2)
To merge this branch: bzr merge lp:~bgh/neutron/ovs-readme
Reviewer Review Type Date Requested Status
Tyler Smith Approve
Somik Behera Approve
dan wendlandt Approve
Review via email: mp+76806@code.launchpad.net
To post a comment you must log in.
Revision history for this message
dan wendlandt (danwent) wrote :

This is stacked on top of the other diablo content, so diff will look funny until they are merged.

Changes are just to documentation... looks good.

review: Approve
Revision history for this message
Somik Behera (somikbehera) wrote :

looks good, seems like the right thing for diablo release as nova code is already out.

review: Approve
Revision history for this message
Tyler Smith (tylesmit) wrote :

Changes to OVS README look good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'quantum/api/networks.py'
2--- quantum/api/networks.py 2011-09-02 11:50:08 +0000
3+++ quantum/api/networks.py 2011-09-23 20:49:23 +0000
4@@ -109,8 +109,9 @@
5 result = builder.build(network)['network']
6 # Wsgi middleware allows us to build the response
7 # before returning the call.
8- # This will allow us to return a 202 status code.
9- return self._build_response(request, dict(network=result), 202)
10+ # This will allow us to return a 200 status code. NOTE: in v1.1 we
11+ # will be returning a 202 status code.
12+ return self._build_response(request, dict(network=result), 200)
13
14 def update(self, request, tenant_id, id):
15 """ Updates the name for the network with the given id """
16
17=== modified file 'quantum/api/ports.py'
18--- quantum/api/ports.py 2011-09-02 11:50:08 +0000
19+++ quantum/api/ports.py 2011-09-23 20:49:23 +0000
20@@ -118,8 +118,9 @@
21 result = builder.build(port)['port']
22 # Wsgi middleware allows us to build the response
23 # before returning the call.
24- # This will allow us to return a 202 status code.
25- return self._build_response(request, dict(port=result), 202)
26+ # This will allow us to return a 200 status code. NOTE: in v1.1
27+ # we will be returning a 202 status code.
28+ return self._build_response(request, dict(port=result), 200)
29 except exception.NetworkNotFound as e:
30 return faults.Fault(faults.NetworkNotFound(e))
31 except exception.StateInvalid as e:
32
33=== modified file 'quantum/plugins/cisco/tests/unit/test_cisco_extension.py'
34--- quantum/plugins/cisco/tests/unit/test_cisco_extension.py 2011-08-31 07:33:54 +0000
35+++ quantum/plugins/cisco/tests/unit/test_cisco_extension.py 2011-09-23 20:49:23 +0000
36@@ -290,7 +290,7 @@
37 delete_path = str(delete_path_temp)
38 delete_response = self.test_app.delete(delete_path)
39
40- self.assertEqual(202, delete_response.status_int)
41+ self.assertEqual(200, delete_response.status_int)
42 LOG.debug("test_delete_portprofile - END")
43
44 def test_delete_portprofileDNE(self, portprofile_id='100'):
45@@ -396,7 +396,7 @@
46 associate_response = self.test_app.put(
47 associate_path, req_assign_body,
48 content_type=self.contenttype)
49- self.assertEqual(202, associate_response.status_int)
50+ self.assertEqual(200, associate_response.status_int)
51
52 # Clean Up - Disassociate and Delete the Port Profile
53 disassociate_path_temp = self.portprofile_path +\
54@@ -459,7 +459,7 @@
55 disassociate_response = self.test_app.put(
56 disassociate_path, req_assign_body,
57 content_type=self.contenttype)
58- self.assertEqual(202, disassociate_response.status_int)
59+ self.assertEqual(200, disassociate_response.status_int)
60 resp_body = wsgi.Serializer().deserialize(index_response.body,
61 self.contenttype)
62 delete_path_temp = self.portprofile_path +\
63@@ -762,7 +762,7 @@
64 resp_body['qoss']['qos']['id']
65 delete_path = str(delete_path_temp)
66 delete_response = self.test_app.delete(delete_path)
67- self.assertEqual(202, delete_response.status_int)
68+ self.assertEqual(200, delete_response.status_int)
69 LOG.debug("test_delete_qos - END")
70
71 def test_delete_qosDNE(self, qos_id='100'):
72@@ -1002,7 +1002,7 @@
73 resp_body['credentials']['credential']['id']
74 delete_path = str(delete_path_temp)
75 delete_response = self.test_app.delete(delete_path)
76- self.assertEqual(202, delete_response.status_int)
77+ self.assertEqual(200, delete_response.status_int)
78 LOG.debug("test_delete_credential - END")
79
80 def test_delete_credentialDNE(self, credential_id='100'):
81
82=== modified file 'quantum/plugins/openvswitch/README'
83--- quantum/plugins/openvswitch/README 2011-09-08 22:38:35 +0000
84+++ quantum/plugins/openvswitch/README 2011-09-23 20:49:23 +0000
85@@ -144,3 +144,19 @@
86 (.. repeat for more ports and interface combinations..)
87
88 See the main quantum documentation for more details on the commands.
89+
90+# -- Using the OVS plugin in multiple hosts
91+#
92+# The integration bridge specified must have a port that is a trunk port
93+# attached otherwise it won't be able to communicate with the outside world.
94+# Here is an example of out to set this up:
95+
96+# If NIC is not attached to a bridge:
97+
98+ovs-vsctl add-port br-int eth0
99+
100+# if NIC is already attached to bridge brX (default on XenServer):
101+
102+ovs-vsctl add-port brX patch-outside -- set Interface patch-outside type=patch options:peer=patch-inside
103+ovs-vsctl add-port br-int patch-inside -- set Interface patch-outside type=patch options:peer=patch-outside
104+
105
106=== modified file 'tests/unit/test_api.py'
107--- tests/unit/test_api.py 2011-09-09 15:59:55 +0000
108+++ tests/unit/test_api.py 2011-09-23 20:49:23 +0000
109@@ -33,7 +33,7 @@
110 class APITest(unittest.TestCase):
111
112 def _create_network(self, format, name=None, custom_req_body=None,
113- expected_res_status=202):
114+ expected_res_status=200):
115 LOG.debug("Creating network")
116 content_type = "application/" + format
117 if name:
118@@ -51,7 +51,7 @@
119 return network_data['network']['id']
120
121 def _create_port(self, network_id, port_state, format,
122- custom_req_body=None, expected_res_status=202):
123+ custom_req_body=None, expected_res_status=200):
124 LOG.debug("Creating port for network %s", network_id)
125 content_type = "application/%s" % format
126 port_req = testlib.new_port_request(self.tenant_id, network_id,

Subscribers

People subscribed via source and target branches