merge salv fix for bug 841982, fix minor pep8 violation

diff --cc tests/unit/test_api.py
index 70af451d31f321a34488eb188b2624ce63b09a66,a0907d1e3d0fd0c1ec0de6f76a026966022fb800..81bcb70a6e52e71eede0f9622bcb4c3ce430fb92
--- 1/tests/unit/test_api.py
--- 2/tests/unit/test_api.py
+++ b/tests/unit/test_api.py
@@@ -298,6 -298,14 +298,15 @@@ class APITest(unittest.TestCase)
          self.assertEqual(len(port_data['ports']), 2)
          LOG.debug("_test_list_ports - format:%s - END", format)
  
 -        LOG.debug("_test_list_ports_networknotfound - format:%s - START", 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