Merge lp:~bgh/neutron/lp837174 into lp:neutron/diablo

[Brad Hall]

Fix unit test printing (lp837174)

[dan wendlandt (danwent)]

LGTM.

Btw, how did you invoke the tests such that you actually got the error? When I run the tests with "./run_tests.sh -N", I never see the original error. Were you running with a higher debug level?

review: Approve

[Brad Hall (bgh)]

You have to use run_tests.py instead of .sh :)

On Mon, Aug 29, 2011 at 11:31 PM, dan wendlandt <email address hidden> wrote:
> Review: Approve
> LGTM.
>
> Btw, how did you invoke the tests such that you actually got the error?  When I run the tests with "./run_tests.sh -N", I never see the original error.  Were you running with a higher debug level?
> --
> https://code.launchpad.net/~bgh/quantum/lp837174/+merge/73329
> You are the owner of lp:~bgh/quantum/lp837174.
>

[Salvatore Orlando (salvatore-orlando)]

> You have to use run_tests.py instead of .sh :)
>

Or just find the tracebacks in run_tests.err.log.
The error did not cause the test to fail. The exception is not canceled by the unit tests, it is the logging module who gracefully kills the operation.

The fix is fine for me. In nova the use of locals() is preferred when possible as it facilitates the translation task (the .pot file contains the actual name of the variable and not just %s).
However this does not matter in this case, as we don't have i18n at the moment, and I dont't think we have a great deal of interest in internationalization for unit tests.

> On Mon, Aug 29, 2011 at 11:31 PM, dan wendlandt <email address hidden> wrote:
> > Review: Approve
> > LGTM.
> >
> > Btw, how did you invoke the tests such that you actually got the error?
> When I run the tests with "./run_tests.sh -N", I never see the original error.
> Were you running with a higher debug level?
> > --
> > https://code.launchpad.net/~bgh/quantum/lp837174/+merge/73329
> > You are the owner of lp:~bgh/quantum/lp837174.
> >

review: Approve

=== modified file 'quantum/db/api.py'
--- quantum/db/api.py	2011-08-17 21:48:56 +0000
+++ quantum/db/api.py	2011-08-30 05:45:17 +0000
@@ -142,6 +142,13 @@
         net = session.query(models.Network).\
           filter_by(uuid=net_id).\
           one()
+
+        ports = session.query(models.Port).\
+            filter_by(network_id=net_id).\
+            all()
+        for p in ports:
+            session.delete(p)
+
         session.delete(net)
         session.flush()
         return net

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-08-24 11:54:53 +0000
+++ tests/unit/test_api.py	2011-08-30 05:45:17 +0000
@@ -218,8 +218,8 @@
         LOG.debug("_test_delete_network - format:%s - START", format)
         content_type = "application/%s" % format
         network_id = self._create_network(format)
-        LOG.debug("Deleting network %(network_id)s"\
-                  " of tenant %(tenant_id)s", locals())
+        LOG.debug("Deleting network %s"\
+                  " of tenant %s" % (network_id, self.tenant_id))
         delete_network_req = testlib.network_delete_request(self.tenant_id,
                                                             network_id,
                                                             format)
@@ -240,8 +240,8 @@
         port_state = "ACTIVE"
         attachment_id = "test_attachment"
         network_id = self._create_network(format)
-        LOG.debug("Deleting network %(network_id)s"\
-                  " of tenant %(tenant_id)s", locals())
+        LOG.debug("Deleting network %s"\
+                  " of tenant %s" % (network_id, self.tenant_id))
         port_id = self._create_port(network_id, port_state, format)
         #plug an attachment into the port
         LOG.debug("Putting attachment into port %s", port_id)
@@ -252,8 +252,8 @@
         attachment_res = attachment_req.get_response(self.api)
         self.assertEquals(attachment_res.status_int, 204)
 
-        LOG.debug("Deleting network %(network_id)s"\
-                  " of tenant %(tenant_id)s", locals())
+        LOG.debug("Deleting network %s"\
+                  " of tenant %s" % (network_id, self.tenant_id))
         delete_network_req = testlib.network_delete_request(self.tenant_id,
                                                             network_id,
                                                             format)
@@ -261,6 +261,26 @@
         self.assertEqual(delete_network_res.status_int, 421)
         LOG.debug("_test_delete_network_in_use - format:%s - END", format)
 
+    def _test_delete_network_with_unattached_port(self, format):
+        LOG.debug("_test_delete_network_with_unattached_port "\
+                    "- format:%s - START", format)
+        content_type = "application/%s" % format
+        port_state = "ACTIVE"
+        network_id = self._create_network(format)
+        LOG.debug("Deleting network %s"\
+                  " of tenant %s" % (network_id, self.tenant_id))
+        port_id = self._create_port(network_id, port_state, format)
+
+        LOG.debug("Deleting network %s"\
+                  " of tenant %s" % (network_id, self.tenant_id))
+        delete_network_req = testlib.network_delete_request(self.tenant_id,
+                                                            network_id,
+                                                            format)
+        delete_network_res = delete_network_req.get_response(self.api)
+        self.assertEqual(delete_network_res.status_int, 204)
+        LOG.debug("_test_delete_network_with_unattached_port "\
+                    "- format:%s - END", format)
+
     def _test_list_ports(self, format):
         LOG.debug("_test_list_ports - format:%s - START", format)
         content_type = "application/%s" % format
@@ -433,8 +453,9 @@
         port_state = "ACTIVE"
         network_id = self._create_network(format)
         port_id = self._create_port(network_id, port_state, format)
-        LOG.debug("Deleting port %(port_id)s for network %(network_id)s"\
-                  " of tenant %(tenant_id)s", locals())
+        LOG.debug("Deleting port %s for network %s"\
+                  " of tenant %s" % (port_id, network_id,
+                    self.tenant_id))
         delete_port_req = testlib.port_delete_request(self.tenant_id,
                                                       network_id, port_id,
                                                       format)
@@ -464,8 +485,9 @@
                                                         attachment_id)
         attachment_res = attachment_req.get_response(self.api)
         self.assertEquals(attachment_res.status_int, 204)
-        LOG.debug("Deleting port %(port_id)s for network %(network_id)s"\
-                  " of tenant %(tenant_id)s", locals())
+        LOG.debug("Deleting port %s for network %s"\
+                  " of tenant %s" % (port_id, network_id,
+                    self.tenant_id))
         delete_port_req = testlib.port_delete_request(self.tenant_id,
                                                       network_id, port_id,
                                                       format)
@@ -848,6 +870,12 @@
     def test_delete_network_in_use_xml(self):
         self._test_delete_network_in_use('xml')
 
+    def test_delete_network_with_unattached_port_xml(self):
+        self._test_delete_network_with_unattached_port('xml')
+
+    def test_delete_network_with_unattached_port_json(self):
+        self._test_delete_network_with_unattached_port('json')
+
     def test_list_ports_json(self):
         self._test_list_ports('json')