Adding unit test for rename_network

diff --git a/quantum/cli.py b/quantum/cli.py
index dbdb91a39a109595b58fcb969e5ea3d139493a6b..15f64fab6fa267f4de4a4b079dad9248859d5676 100644 (file)
--- a/quantum/cli.py
+++ b/quantum/cli.py
@@ -38,8 +38,8 @@ def _handle_exception(ex):
     if ex.args and isinstance(ex.args[-1][0], dict):
         status_code = ex.args[-1][0].get('status_code', None)
         message = ex.args[-1][0].get('message', None)
-    msg_1 = "Command failed with error code: %s" % status_code or '<missing>'
-    msg_2 = "Error message:%s" % message or '<missing>'
+    msg_1 = "Command failed with error code: %s" % (status_code or '<missing>')
+    msg_2 = "Error message:%s" % (message or '<missing>')
     LOG.exception(msg_1 + "-" + msg_2)
     print msg_1
     print msg_2
@@ -118,8 +118,8 @@ def rename_net(client, *args):
         client.update_network(network_id, data)
         LOG.debug("Operation 'update_network' executed.")
         # Response has no body. Use data for populating output
-        data['id'] = network_id
-        output = prepare_output("rename_net", tenant_id, dict(network=data))
+        data['network']['id'] = network_id
+        output = prepare_output("rename_net", tenant_id, data)
         print output
     except Exception as ex:
         _handle_exception(ex)

diff --git a/quantum/cli_output.template b/quantum/cli_output.template
index 18f04092659b2cde5d277e32441a3c66a82792c3..1e1abbd2bdec6f4ee95fa29e1b33002a81737af0 100644 (file)
--- a/quantum/cli_output.template
+++ b/quantum/cli_output.template
@@ -16,7 +16,7 @@ Remote Interfaces on Virtual Network
 #end for
 #elif $cmd == 'rename_net'
 Renamed Virtual Network with ID: $network.id for Tenant $tenant_id, 
-New name is: $network.name
+New name is: $network['net-name']
 #elif $cmd == 'list_ports'
 Ports on Virtual Network: $network_id
 #for $port in $ports

diff --git a/quantum/client.py b/quantum/client.py
index 9ac991ec3116754cb9a2ce82a1b2cf9bacd8eeff..5898d92b71733ad4d926c9b59926aef3d2dec43f 100644 (file)
--- a/quantum/client.py
+++ b/quantum/client.py
@@ -16,12 +16,15 @@
 #    under the License.
 #    @author: Tyler Smith, Cisco Systems
 
+import logging
 import httplib
 import socket
 import urllib
 
 from quantum.common.wsgi import Serializer
 
+LOG = logging.getLogger('client')
+
 
 class api_call(object):
     """A Decorator to add support for format and tenant overriding"""
@@ -112,7 +115,7 @@ class Client(object):
                              to action
 
         """
-
+        LOG.debug("Client issuing request: %s", action)
         # Ensure we have a tenant id
         if not self.tenant:
             raise Exception("Tenant ID not set")
@@ -124,12 +127,10 @@ class Client(object):
 
         if type(params) is dict:
             action += '?' + urllib.urlencode(params)
-
         try:
             connection_type = self.get_connection_type()
             headers = headers or {"Content-Type":
                                       "application/%s" % self.format}
-
             # Open connection and send request, handling SSL certs
             certs = {'key_file': self.key_file, 'cert_file': self.cert_file}
             certs = dict((x, certs[x]) for x in certs if certs[x] != None)
@@ -138,7 +139,6 @@ class Client(object):
                 c = connection_type(self.host, self.port, **certs)
             else:
                 c = connection_type(self.host, self.port)
-
             res = self._send_request(c, method, action, body, headers)
             status_code = self.get_status_code(res)
             if status_code in (httplib.OK,
@@ -148,11 +148,13 @@ class Client(object):
                 return self.deserialize(res)
             else:
                 # Create exception with HTTP status code and message
+                error_message = res.read()
+                LOG.debug("Server returned error: %s", status_code)
+                LOG.debug("Error message: %s", error_message)
                 ex = Exception("Server returned error: %s" % status_code)
                 ex.args = ([dict(status_code=status_code,
-                                 message=res.read())],)
+                                 message=error_message)],)
                 raise ex
-
         except (socket.error, IOError), e:
             raise Exception("Unable to connect to "
                             "server. Got error: %s" % e)
@@ -172,7 +174,7 @@ class Client(object):
             return Serializer().serialize(data, self.content_type())
 
     def deserialize(self, data):
-        if self.get_status_code(data) == 202:
+        if self.get_status_code(data) in (202, 204):
             return data.read()
         return Serializer().deserialize(data.read(), self.content_type())
 

diff --git a/tests/unit/test_cli.py b/tests/unit/test_cli.py
index 5bbe754f0b52abf02e1b9d98ed4a64cab2bc26b6..f9aee4317ecc1ff12be4f969b863fd86750fe689 100644 (file)
--- a/tests/unit/test_cli.py
+++ b/tests/unit/test_cli.py
@@ -95,7 +95,19 @@ class CLITest(unittest.TestCase):
             # Must add newline at the end to match effect of print call
             self.assertEquals(self.fake_stdout.make_string(), output + '\n')
 
-    def test_list_networks_api(self):
+    def _verify_rename_network(self):
+            # Verification - get raw result from db
+            nw_list = db.network_list(self.tenant_id)
+            network_data = {'id': nw_list[0].uuid,
+                            'net-name': nw_list[0].name}
+            # Fill CLI template
+            output = cli.prepare_output('rename_net', self.tenant_id,
+                                        dict(network=network_data))
+            # Verify!
+            # Must add newline at the end to match effect of print call
+            self.assertEquals(self.fake_stdout.make_string(), output + '\n')
+
+    def test_list_networks(self):
         try:
             # Pre-populate data for testing using db api
             db.network_create(self.tenant_id, self.network_name_1)
@@ -107,9 +119,9 @@ class CLITest(unittest.TestCase):
             self._verify_list_networks()
         except:
             LOG.exception("Exception caught: %s", sys.exc_info())
-            self.fail("test_list_network_api failed due to an exception")
+            self.fail("test_list_networks failed due to an exception")
 
-    def test_create_network_api(self):
+    def test_create_network(self):
         try:
             cli.create_net(self.client, self.tenant_id, "test")
             LOG.debug("Operation completed. Verifying result")
@@ -117,29 +129,35 @@ class CLITest(unittest.TestCase):
             self._verify_create_network()
         except:
             LOG.exception("Exception caught: %s", sys.exc_info())
-            self.fail("test_create_network_api failed due to an exception")
+            self.fail("test_create_network failed due to an exception")
 
-    def _prepare_test_delete_network(self):
-        # Pre-populate data for testing using db api
-        db.network_create(self.tenant_id, self.network_name_1)
-        net_id = db.network_list(self.tenant_id)[0]['uuid']
-        return net_id
-
-    def test_delete_network_api(self):
+    def test_delete_network(self):
         try:
-            network_id = self._prepare_test_delete_network()
+            db.network_create(self.tenant_id, self.network_name_1)
+            network_id = db.network_list(self.tenant_id)[0]['uuid']
             cli.delete_net(self.client, self.tenant_id, network_id)
             LOG.debug("Operation completed. Verifying result")
             LOG.debug(self.fake_stdout.content)
             self._verify_delete_network(network_id)
         except:
             LOG.exception("Exception caught: %s", sys.exc_info())
-            self.fail("test_delete_network_api failed due to an exception")
+            self.fail("test_delete_network failed due to an exception")
+
+    def test_detail_network(self):
+        # Load some data into the datbase
+        net = db.network_create(self.tenant_id, self.network_name_1)
+        db.port_create(net['uuid'])
+        port = db.port_create(net['uuid'])
+        cli.detail_net(self.client, self.tenant_id, net['uuid'])
+        db.port_set_attachment(port['uuid'], net['uuid'], "test_iface_id")
 
-    def test_detail_network_api(self):
-            # Load some data into the datbase
+    def test_rename_network(self):
+        try:
             net = db.network_create(self.tenant_id, self.network_name_1)
-            db.port_create(net['uuid'])
-            port = db.port_create(net['uuid'])
-            cli.detail_net(self.client, self.tenant_id, net['uuid'])
-            db.port_set_attachment(port['uuid'], net['uuid'], "test_iface_id")
+            network_id = net['uuid']
+            cli.rename_net(self.client, self.tenant_id,
+                           network_id, self.network_name_2)
+            self._verify_rename_network()
+        except:
+            LOG.exception("Exception caught: %s", sys.exc_info())
+            self.fail("test_rename_network failed due to an exception")