Merge lp:~salvatore-orlando/neutron/bug841982 into lp:neutron/diablo

[Salvatore Orlando]

Fixes a bug in FakePlugin.get_all_ports
This method was returning an empty list instead of raising an exception if the network did not exist.

Also adding the relevant API unit test.

[dan wendlandt (danwent)]

lgtm... hooray for increased test coverage.

review: Approve

[Brad Hall (bgh)]

Looks good

review: Approve

[Tyler Smith (tylesmit)]

Tests pass, lgtm.

review: Approve

[dan wendlandt (danwent)]

This fixes the issue in FakePlugin, but I'd prefer to see it fixed for any plugins that use the DB model. I think tweaking the quantum/db/api.py would be more inline with how we detect invalid networks in port related calls (all other calls in quantum/db/api.py already do this, not sure why port_list() does not). Something like:

=== modified file 'quantum/db/api.py'
--- quantum/db/api.py 2011-08-30 01:16:39 +0000
+++ quantum/db/api.py 2011-09-06 21:24:53 +0000
@@ -170,6 +170,9 @@

 def port_list(net_id):
+ # confirm network exists
+ network_get(net_id)
+
     session = get_session()
     return session.query(models.Port).\
       filter_by(network_id=net_id).\

Thoughts?

review: Needs Information

[lp:~salvatore-orlando/neutron/bug841982]

65. By Salvatore Orlando on 2011-09-07

Implementing Dan's suggestion concerning fixing the bug in db api rather than FakePlugin

[Salvatore Orlando (salvatore-orlando)]

Good point.
I updated the code. The bug is now fixed in db/api.py

[dan wendlandt (danwent)]

great. I fixed a minor pep8 issue as part of the merge into trunk, hope you don't mind.

review: Approve

=== modified file 'quantum/db/api.py'
--- quantum/db/api.py	2011-08-30 01:16:39 +0000
+++ quantum/db/api.py	2011-09-07 10:20:44 +0000
@@ -170,6 +170,8 @@
 
 
 def port_list(net_id):
+    # confirm network exists
+    network_get(net_id)
     session = get_session()
     return session.query(models.Port).\
       filter_by(network_id=net_id).\

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-08-30 16:30:15 +0000
+++ tests/unit/test_api.py	2011-09-07 10:20:44 +0000
@@ -298,6 +298,14 @@
         self.assertEqual(len(port_data['ports']), 2)
         LOG.debug("_test_list_ports - format:%s - END", format)
 
+    def _test_list_ports_networknotfound(self, format):
+        LOG.debug("_test_list_ports_networknotfound - format:%s - START", format)
+        list_port_req = testlib.port_list_request(self.tenant_id,
+                                                  "A_BAD_ID", format)
+        list_port_res = list_port_req.get_response(self.api)
+        self.assertEqual(list_port_res.status_int, 420)
+        LOG.debug("_test_list_ports_networknotfound - format:%s - END", format)
+
     def _test_list_ports_detail(self, format):
         LOG.debug("_test_list_ports_detail - format:%s - START", format)
         content_type = "application/%s" % format
@@ -882,6 +890,12 @@
     def test_list_ports_xml(self):
         self._test_list_ports('xml')
 
+    def test_list_ports_networknotfound_json(self):
+        self._test_list_ports_networknotfound('json')
+
+    def test_list_ports_networknotfound_xml(self):
+        self._test_list_ports_networknotfound('xml')
+
     def test_list_ports_detail_json(self):
         self._test_list_ports_detail('json')