Merge lp:~bgh/neutron/202to200 into lp:neutron/diablo

[Brad Hall]

Pick up 202->200 changes. This is the same as salvatore's branch but it doesn't include the attachment_id fix and it also changes the expected return code in the cisco plugin tests.

[dan wendlandt (danwent)]

Will be running tests on this as part of the final tests for diablo.

Will try to figure out how to invoke the Cisco tests, but it would be great if someone from that team was able to do a quick review as well.

review: Approve

[dan wendlandt (danwent)]

As an update, I tried running the cisco tests, but they seem to require that the config file has a database set, so I got many failures with the line:

OperationalError: (OperationalError) (2005, "Unknown MySQL server host '<put_quantum_mysql_host_here>' (1)") None None

Hopefully we can get someone from Cisco to run the tests on their setup (Brad's changes seem pretty benign, but its best to be overly cautious)

[Tyler Smith (tylesmit)]

Give me a minute; I'm setting up now.

[Tyler Smith (tylesmit)]

I'm getting 2 errors and 5 failures. The failures are definitely caused by this. I'm looking into it.

[Tyler Smith (tylesmit)]

I've fixed the issue and sent a merge prop from the fixed branch to this one. Once it's merged in everything should be good.

review: Approve

=== modified file 'quantum/api/networks.py'
--- quantum/api/networks.py	2011-09-02 11:50:08 +0000
+++ quantum/api/networks.py	2011-09-23 20:25:27 +0000
@@ -109,8 +109,9 @@
         result = builder.build(network)['network']
         # Wsgi middleware allows us to build the response
         # before returning the call.
-        # This will allow us to return a 202 status code.
-        return self._build_response(request, dict(network=result), 202)
+        # This will allow us to return a 200 status code.  NOTE: in v1.1 we
+        # will be returning a 202 status code.
+        return self._build_response(request, dict(network=result), 200)
 
     def update(self, request, tenant_id, id):
         """ Updates the name for the network with the given id """

=== modified file 'quantum/api/ports.py'
--- quantum/api/ports.py	2011-09-02 11:50:08 +0000
+++ quantum/api/ports.py	2011-09-23 20:25:27 +0000
@@ -118,8 +118,9 @@
             result = builder.build(port)['port']
             # Wsgi middleware allows us to build the response
             # before returning the call.
-            # This will allow us to return a 202 status code.
-            return self._build_response(request, dict(port=result), 202)
+            # This will allow us to return a 200 status code.  NOTE: in v1.1
+            # we will be returning a 202 status code.
+            return self._build_response(request, dict(port=result), 200)
         except exception.NetworkNotFound as e:
             return faults.Fault(faults.NetworkNotFound(e))
         except exception.StateInvalid as e:

=== modified file 'quantum/plugins/cisco/tests/unit/test_cisco_extension.py'
--- quantum/plugins/cisco/tests/unit/test_cisco_extension.py	2011-08-31 07:33:54 +0000
+++ quantum/plugins/cisco/tests/unit/test_cisco_extension.py	2011-09-23 20:25:27 +0000
@@ -290,7 +290,7 @@
         delete_path = str(delete_path_temp)
         delete_response = self.test_app.delete(delete_path)
 
-        self.assertEqual(202, delete_response.status_int)
+        self.assertEqual(200, delete_response.status_int)
         LOG.debug("test_delete_portprofile - END")
 
     def test_delete_portprofileDNE(self, portprofile_id='100'):
@@ -396,7 +396,7 @@
         associate_response = self.test_app.put(
                                   associate_path, req_assign_body,
                                   content_type=self.contenttype)
-        self.assertEqual(202, associate_response.status_int)
+        self.assertEqual(200, associate_response.status_int)
 
         # Clean Up - Disassociate and Delete the Port Profile
         disassociate_path_temp = self.portprofile_path +\
@@ -459,7 +459,7 @@
         disassociate_response = self.test_app.put(
                                      disassociate_path, req_assign_body,
                                      content_type=self.contenttype)
-        self.assertEqual(202, disassociate_response.status_int)
+        self.assertEqual(200, disassociate_response.status_int)
         resp_body = wsgi.Serializer().deserialize(index_response.body,
                                                   self.contenttype)
         delete_path_temp = self.portprofile_path +\
@@ -762,7 +762,7 @@
                 resp_body['qoss']['qos']['id']
         delete_path = str(delete_path_temp)
         delete_response = self.test_app.delete(delete_path)
-        self.assertEqual(202, delete_response.status_int)
+        self.assertEqual(200, delete_response.status_int)
         LOG.debug("test_delete_qos - END")
 
     def test_delete_qosDNE(self, qos_id='100'):
@@ -1002,7 +1002,7 @@
                            resp_body['credentials']['credential']['id']
         delete_path = str(delete_path_temp)
         delete_response = self.test_app.delete(delete_path)
-        self.assertEqual(202, delete_response.status_int)
+        self.assertEqual(200, delete_response.status_int)
         LOG.debug("test_delete_credential - END")
 
     def test_delete_credentialDNE(self, credential_id='100'):

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-09-09 15:59:55 +0000
+++ tests/unit/test_api.py	2011-09-23 20:25:27 +0000
@@ -33,7 +33,7 @@
 class APITest(unittest.TestCase):
 
     def _create_network(self, format, name=None, custom_req_body=None,
-                        expected_res_status=202):
+                        expected_res_status=200):
         LOG.debug("Creating network")
         content_type = "application/" + format
         if name:
@@ -51,7 +51,7 @@
             return network_data['network']['id']
 
     def _create_port(self, network_id, port_state, format,
-                     custom_req_body=None, expected_res_status=202):
+                     custom_req_body=None, expected_res_status=200):
         LOG.debug("Creating port for network %s", network_id)
         content_type = "application/%s" % format
         port_req = testlib.new_port_request(self.tenant_id, network_id,