Rename quantumclient to neutronclient2.2.4

Implements Blueprint: remove-use-of-quantum

Change-Id: Idebe92d56d277435ffd23f292984f9b8b8fdb2df

20 files changed, 72 insertions, 72 deletions

diff --git a/tests/unit/lb/test_cli20_healthmonitor.py b/tests/unit/lb/test_cli20_healthmonitor.py
index 0b87ff9..51bc894 100644
--- a/tests/unit/lb/test_cli20_healthmonitor.py
+++ b/tests/unit/lb/test_cli20_healthmonitor.py
@@ -21,7 +21,7 @@ import sys
 
 import mox
 
-from quantumclient.quantum.v2_0.lb import healthmonitor
+from neutronclient.neutron.v2_0.lb import healthmonitor
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/lb/test_cli20_member.py b/tests/unit/lb/test_cli20_member.py
index 9b75367..b280320 100644
--- a/tests/unit/lb/test_cli20_member.py
+++ b/tests/unit/lb/test_cli20_member.py
@@ -19,7 +19,7 @@
 
 import sys
 
-from quantumclient.quantum.v2_0.lb import member
+from neutronclient.neutron.v2_0.lb import member
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/lb/test_cli20_pool.py b/tests/unit/lb/test_cli20_pool.py
index 709c3d1..f54d71d 100644
--- a/tests/unit/lb/test_cli20_pool.py
+++ b/tests/unit/lb/test_cli20_pool.py
@@ -21,7 +21,7 @@ import sys
 
 import mox
 
-from quantumclient.quantum.v2_0.lb import pool
+from neutronclient.neutron.v2_0.lb import pool
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/lb/test_cli20_vip.py b/tests/unit/lb/test_cli20_vip.py
index 4358cfb..f34efd6 100644
--- a/tests/unit/lb/test_cli20_vip.py
+++ b/tests/unit/lb/test_cli20_vip.py
@@ -19,7 +19,7 @@
 
 import sys
 
-from quantumclient.quantum.v2_0.lb import vip
+from neutronclient.neutron.v2_0.lb import vip
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/test_auth.py b/tests/unit/test_auth.py
index 06cc2de..52f0214 100644
--- a/tests/unit/test_auth.py
+++ b/tests/unit/test_auth.py
@@ -23,8 +23,8 @@ import uuid
 import mox
 import testtools
 
-from quantumclient import client
-from quantumclient.common import exceptions
+from neutronclient import client
+from neutronclient.common import exceptions
 
 
 USERNAME = 'testuser'
@@ -48,7 +48,7 @@ KS_TOKEN_RESULT = {
                             'publicURL': ENDPOINT_URL,
                             'region': REGION}],
              'type': 'network',
-             'name': 'Quantum Service'}
+             'name': 'Neutron Service'}
         ]
     }
 }
@@ -56,7 +56,7 @@ KS_TOKEN_RESULT = {
 ENDPOINTS_RESULT = {
     'endpoints': [{
         'type': 'network',
-        'name': 'Quantum Service',
+        'name': 'Neutron Service',
         'region': REGION,
         'adminURL': ENDPOINT_URL,
         'internalURL': ENDPOINT_URL,
@@ -110,7 +110,7 @@ class CLITestAuthKeystone(testtools.TestCase):
         res401 = self.mox.CreateMock(httplib2.Response)
         res401.status = 401
 
-        # If a token is expired, quantum server retruns 401
+        # If a token is expired, neutron server retruns 401
         self.client.request(
             mox.StrContains(ENDPOINT_URL + '/resource'), 'GET',
             headers=mox.ContainsKeyValue('X-Auth-Token', TOKEN)
diff --git a/tests/unit/test_casual_args.py b/tests/unit/test_casual_args.py
index fcfff93..1722e68 100644
--- a/tests/unit/test_casual_args.py
+++ b/tests/unit/test_casual_args.py
@@ -17,83 +17,83 @@
 
 import testtools
 
-from quantumclient.common import exceptions
-from quantumclient.quantum import v2_0 as quantumV20
+from neutronclient.common import exceptions
+from neutronclient.neutron import v2_0 as neutronV20
 
 
 class CLITestArgs(testtools.TestCase):
 
     def test_empty(self):
-        _mydict = quantumV20.parse_args_to_dict([])
+        _mydict = neutronV20.parse_args_to_dict([])
         self.assertEqual({}, _mydict)
 
     def test_default_bool(self):
         _specs = ['--my_bool', '--arg1', 'value1']
-        _mydict = quantumV20.parse_args_to_dict(_specs)
+        _mydict = neutronV20.parse_args_to_dict(_specs)
         self.assertTrue(_mydict['my_bool'])
 
     def test_bool_true(self):
         _specs = ['--my-bool', 'type=bool', 'true', '--arg1', 'value1']
-        _mydict = quantumV20.parse_args_to_dict(_specs)
+        _mydict = neutronV20.parse_args_to_dict(_specs)
         self.assertTrue(_mydict['my_bool'])
 
     def test_bool_false(self):
         _specs = ['--my_bool', 'type=bool', 'false', '--arg1', 'value1']
-        _mydict = quantumV20.parse_args_to_dict(_specs)
+        _mydict = neutronV20.parse_args_to_dict(_specs)
         self.assertFalse(_mydict['my_bool'])
 
     def test_nargs(self):
         _specs = ['--tag', 'x', 'y', '--arg1', 'value1']
-        _mydict = quantumV20.parse_args_to_dict(_specs)
+        _mydict = neutronV20.parse_args_to_dict(_specs)
         self.assertTrue('x' in _mydict['tag'])
         self.assertTrue('y' in _mydict['tag'])
 
     def test_badarg(self):
         _specs = ['--tag=t', 'x', 'y', '--arg1', 'value1']
         self.assertRaises(exceptions.CommandError,
-                          quantumV20.parse_args_to_dict, _specs)
+                          neutronV20.parse_args_to_dict, _specs)
 
     def test_badarg_with_minus(self):
         _specs = ['--arg1', 'value1', '-D']
         self.assertRaises(exceptions.CommandError,
-                          quantumV20.parse_args_to_dict, _specs)
+                          neutronV20.parse_args_to_dict, _specs)
 
     def test_goodarg_with_minus_number(self):
         _specs = ['--arg1', 'value1', '-1', '-1.0']
-        _mydict = quantumV20.parse_args_to_dict(_specs)
+        _mydict = neutronV20.parse_args_to_dict(_specs)
         self.assertEqual(['value1', '-1', '-1.0'],
                          _mydict['arg1'])
 
     def test_badarg_duplicate(self):
         _specs = ['--tag=t', '--arg1', 'value1', '--arg1', 'value1']
         self.assertRaises(exceptions.CommandError,
-                          quantumV20.parse_args_to_dict, _specs)
+                          neutronV20.parse_args_to_dict, _specs)
 
     def test_badarg_early_type_specification(self):
         _specs = ['type=dict', 'key=value']
         self.assertRaises(exceptions.CommandError,
-                          quantumV20.parse_args_to_dict, _specs)
+                          neutronV20.parse_args_to_dict, _specs)
 
     def test_arg(self):
         _specs = ['--tag=t', '--arg1', 'value1']
         self.assertEqual('value1',
-                         quantumV20.parse_args_to_dict(_specs)['arg1'])
+                         neutronV20.parse_args_to_dict(_specs)['arg1'])
 
     def test_dict_arg(self):
         _specs = ['--tag=t', '--arg1', 'type=dict', 'key1=value1,key2=value2']
-        arg1 = quantumV20.parse_args_to_dict(_specs)['arg1']
+        arg1 = neutronV20.parse_args_to_dict(_specs)['arg1']
         self.assertEqual('value1', arg1['key1'])
         self.assertEqual('value2', arg1['key2'])
 
     def test_dict_arg_with_attribute_named_type(self):
         _specs = ['--tag=t', '--arg1', 'type=dict', 'type=value1,key2=value2']
-        arg1 = quantumV20.parse_args_to_dict(_specs)['arg1']
+        arg1 = neutronV20.parse_args_to_dict(_specs)['arg1']
         self.assertEqual('value1', arg1['type'])
         self.assertEqual('value2', arg1['key2'])
 
     def test_list_of_dict_arg(self):
         _specs = ['--tag=t', '--arg1', 'type=dict',
                   'list=true', 'key1=value1,key2=value2']
-        arg1 = quantumV20.parse_args_to_dict(_specs)['arg1']
+        arg1 = neutronV20.parse_args_to_dict(_specs)['arg1']
         self.assertEqual('value1', arg1[0]['key1'])
         self.assertEqual('value2', arg1[0]['key2'])
diff --git a/tests/unit/test_cli20.py b/tests/unit/test_cli20.py
index c89cdfa..b1b6490 100644
--- a/tests/unit/test_cli20.py
+++ b/tests/unit/test_cli20.py
@@ -21,9 +21,9 @@ import fixtures
 import mox
 import testtools
 
-from quantumclient.common import constants
-from quantumclient import shell
-from quantumclient.v2_0 import client
+from neutronclient.common import constants
+from neutronclient import shell
+from neutronclient.v2_0 import client
 
 
 API_VERSION = "2.0"
@@ -170,10 +170,10 @@ class CLITestV20Base(testtools.TestCase):
         self.fake_stdout = FakeStdout()
         self.useFixture(fixtures.MonkeyPatch('sys.stdout', self.fake_stdout))
         self.useFixture(fixtures.MonkeyPatch(
-            'quantumclient.quantum.v2_0.find_resourceid_by_name_or_id',
+            'neutronclient.neutron.v2_0.find_resourceid_by_name_or_id',
             self._find_resourceid))
         self.useFixture(fixtures.MonkeyPatch(
-            'quantumclient.v2_0.client.Client.get_attr_metadata',
+            'neutronclient.v2_0.client.Client.get_attr_metadata',
             self._get_attr_metadata))
         self.client = client.Client(token=TOKEN, endpoint_url=self.endurl)
 
diff --git a/tests/unit/test_cli20_extensions.py b/tests/unit/test_cli20_extensions.py
index 874de77..16664ac 100644
--- a/tests/unit/test_cli20_extensions.py
+++ b/tests/unit/test_cli20_extensions.py
@@ -17,8 +17,8 @@
 
 import sys
 
-from quantumclient.quantum.v2_0.extension import ListExt
-from quantumclient.quantum.v2_0.extension import ShowExt
+from neutronclient.neutron.v2_0.extension import ListExt
+from neutronclient.neutron.v2_0.extension import ShowExt
 from tests.unit.test_cli20 import CLITestV20Base
 from tests.unit.test_cli20 import MyApp
 
diff --git a/tests/unit/test_cli20_floatingips.py b/tests/unit/test_cli20_floatingips.py
index b640112..8e7e588 100644
--- a/tests/unit/test_cli20_floatingips.py
+++ b/tests/unit/test_cli20_floatingips.py
@@ -18,7 +18,7 @@
 
 import sys
 
-from quantumclient.quantum.v2_0 import floatingip as fip
+from neutronclient.neutron.v2_0 import floatingip as fip
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/test_cli20_network.py b/tests/unit/test_cli20_network.py
index 7df54ff..4fc8235 100644
--- a/tests/unit/test_cli20_network.py
+++ b/tests/unit/test_cli20_network.py
@@ -18,10 +18,10 @@ import sys
 
 import mox
 
-from quantumclient.common import exceptions
-from quantumclient.common import utils
-from quantumclient.quantum.v2_0 import network
-from quantumclient import shell
+from neutronclient.common import exceptions
+from neutronclient.common import utils
+from neutronclient.neutron.v2_0 import network
+from neutronclient import shell
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/test_cli20_nvp_queue.py b/tests/unit/test_cli20_nvp_queue.py
index d84d9df..f745526 100644
--- a/tests/unit/test_cli20_nvp_queue.py
+++ b/tests/unit/test_cli20_nvp_queue.py
@@ -18,7 +18,7 @@
 
 import sys
 
-from quantumclient.quantum.v2_0 import nvp_qos_queue as qos
+from neutronclient.neutron.v2_0 import nvp_qos_queue as qos
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/test_cli20_nvpnetworkgateway.py b/tests/unit/test_cli20_nvpnetworkgateway.py
index ebf730a..81185aa 100644
--- a/tests/unit/test_cli20_nvpnetworkgateway.py
+++ b/tests/unit/test_cli20_nvpnetworkgateway.py
@@ -17,7 +17,7 @@
 
 import sys
 
-from quantumclient.quantum.v2_0 import nvpnetworkgateway as nwgw
+from neutronclient.neutron.v2_0 import nvpnetworkgateway as nwgw
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/test_cli20_port.py b/tests/unit/test_cli20_port.py
index 545f35b..150cf8f 100644
--- a/tests/unit/test_cli20_port.py
+++ b/tests/unit/test_cli20_port.py
@@ -19,8 +19,8 @@ import sys
 
 import mox
 
-from quantumclient.quantum.v2_0 import port
-from quantumclient import shell
+from neutronclient.neutron.v2_0 import port
+from neutronclient import shell
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/test_cli20_router.py b/tests/unit/test_cli20_router.py
index 35ac577..c8ef882 100644
--- a/tests/unit/test_cli20_router.py
+++ b/tests/unit/test_cli20_router.py
@@ -17,8 +17,8 @@
 
 import sys
 
-from quantumclient.common import exceptions
-from quantumclient.quantum.v2_0 import router
+from neutronclient.common import exceptions
+from neutronclient.neutron.v2_0 import router
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/test_cli20_securitygroup.py b/tests/unit/test_cli20_securitygroup.py
index 4302093..b7bea09 100644
--- a/tests/unit/test_cli20_securitygroup.py
+++ b/tests/unit/test_cli20_securitygroup.py
@@ -20,7 +20,7 @@ import sys
 
 import mox
 
-from quantumclient.quantum.v2_0 import securitygroup
+from neutronclient.neutron.v2_0 import securitygroup
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/test_cli20_subnet.py b/tests/unit/test_cli20_subnet.py
index 5c048a6..c7fc9fd 100644
--- a/tests/unit/test_cli20_subnet.py
+++ b/tests/unit/test_cli20_subnet.py
@@ -17,7 +17,7 @@
 
 import sys
 
-from quantumclient.quantum.v2_0 import subnet
+from neutronclient.neutron.v2_0 import subnet
 from tests.unit import test_cli20
 
 
diff --git a/tests/unit/test_name_or_id.py b/tests/unit/test_name_or_id.py
index fc3bdac..09de0ad 100644
--- a/tests/unit/test_name_or_id.py
+++ b/tests/unit/test_name_or_id.py
@@ -20,9 +20,9 @@ import uuid
 import mox
 import testtools
 
-from quantumclient.common import exceptions
-from quantumclient.quantum import v2_0 as quantumv20
-from quantumclient.v2_0 import client
+from neutronclient.common import exceptions
+from neutronclient.neutron import v2_0 as neutronV20
+from neutronclient.v2_0 import client
 from tests.unit import test_cli20
 
 
@@ -50,7 +50,7 @@ class CLITestNameorID(testtools.TestCase):
             headers=mox.ContainsKeyValue('X-Auth-Token', test_cli20.TOKEN)
         ).AndReturn((test_cli20.MyResp(200), resstr))
         self.mox.ReplayAll()
-        returned_id = quantumv20.find_resourceid_by_name_or_id(
+        returned_id = neutronV20.find_resourceid_by_name_or_id(
             self.client, 'network', _id)
         self.assertEqual(_id, returned_id)
 
@@ -72,7 +72,7 @@ class CLITestNameorID(testtools.TestCase):
             headers=mox.ContainsKeyValue('X-Auth-Token', test_cli20.TOKEN)
         ).AndReturn((test_cli20.MyResp(200), resstr))
         self.mox.ReplayAll()
-        returned_id = quantumv20.find_resourceid_by_name_or_id(
+        returned_id = neutronV20.find_resourceid_by_name_or_id(
             self.client, 'network', _id)
         self.assertEqual(_id, returned_id)
 
@@ -89,7 +89,7 @@ class CLITestNameorID(testtools.TestCase):
             headers=mox.ContainsKeyValue('X-Auth-Token', test_cli20.TOKEN)
         ).AndReturn((test_cli20.MyResp(200), resstr))
         self.mox.ReplayAll()
-        returned_id = quantumv20.find_resourceid_by_name_or_id(
+        returned_id = neutronV20.find_resourceid_by_name_or_id(
             self.client, 'network', name)
         self.assertEqual(_id, returned_id)
 
@@ -107,9 +107,9 @@ class CLITestNameorID(testtools.TestCase):
         ).AndReturn((test_cli20.MyResp(200), resstr))
         self.mox.ReplayAll()
         try:
-            quantumv20.find_resourceid_by_name_or_id(
+            neutronV20.find_resourceid_by_name_or_id(
                 self.client, 'network', name)
-        except exceptions.QuantumClientException as ex:
+        except exceptions.NeutronClientException as ex:
             self.assertTrue('Multiple' in ex.message)
 
     def test_get_id_from_name_notfound(self):
@@ -125,8 +125,8 @@ class CLITestNameorID(testtools.TestCase):
         ).AndReturn((test_cli20.MyResp(200), resstr))
         self.mox.ReplayAll()
         try:
-            quantumv20.find_resourceid_by_name_or_id(
+            neutronV20.find_resourceid_by_name_or_id(
                 self.client, 'network', name)
-        except exceptions.QuantumClientException as ex:
+        except exceptions.NeutronClientException as ex:
             self.assertTrue('Unable to find' in ex.message)
             self.assertEqual(404, ex.status_code)
diff --git a/tests/unit/test_quota.py b/tests/unit/test_quota.py
index 633ff62..e971f46 100644
--- a/tests/unit/test_quota.py
+++ b/tests/unit/test_quota.py
@@ -17,8 +17,8 @@
 
 import sys
 
-from quantumclient.common import exceptions
-from quantumclient.quantum.v2_0 import quota as test_quota
+from neutronclient.common import exceptions
+from neutronclient.neutron.v2_0 import quota as test_quota
 from tests.unit import test_cli20
 
 
@@ -36,7 +36,7 @@ class CLITestV20Quota(test_cli20.CLITestV20Base):
             test_cli20.MyApp(sys.stdout), None)
         args = ['--tenant-id', self.test_id, '--network', 'test']
         self.assertRaises(
-            exceptions.QuantumClientException, self._test_update_resource,
+            exceptions.NeutronClientException, self._test_update_resource,
             resource, cmd, self.test_id, args=args,
             extrafields={'network': 'new'})
 
diff --git a/tests/unit/test_shell.py b/tests/unit/test_shell.py
index b6a8e14..a3ac68b 100644
--- a/tests/unit/test_shell.py
+++ b/tests/unit/test_shell.py
@@ -25,8 +25,8 @@ import mox
 import testtools
 from testtools import matchers
 
-from quantumclient.common import exceptions
-from quantumclient import shell as openstack_shell
+from neutronclient.common import exceptions
+from neutronclient import shell as openstack_shell
 
 
 DEFAULT_USERNAME = 'username'
@@ -53,7 +53,7 @@ class ShellTest(testtools.TestCase):
         'OS_AUTH_URL': DEFAULT_AUTH_URL}
 
     def _tolerant_shell(self, cmd):
-        t_shell = openstack_shell.QuantumShell('2.0')
+        t_shell = openstack_shell.NeutronShell('2.0')
         t_shell.run(cmd.split())
 
     # Patch os.environ to avoid required auth info.
@@ -68,7 +68,7 @@ class ShellTest(testtools.TestCase):
         # Make a fake shell object, a helping wrapper to call it, and a quick
         # way of asserting that certain API calls were made.
         global shell, _shell, assert_called, assert_called_anytime
-        _shell = openstack_shell.QuantumShell('2.0')
+        _shell = openstack_shell.NeutronShell('2.0')
         shell = lambda cmd: _shell.run(cmd.split())
 
     def shell(self, argstr):
@@ -77,7 +77,7 @@ class ShellTest(testtools.TestCase):
         _old_env, os.environ = os.environ, clean_env.copy()
         try:
             sys.stdout = cStringIO.StringIO()
-            _shell = openstack_shell.QuantumShell('2.0')
+            _shell = openstack_shell.NeutronShell('2.0')
             _shell.run(argstr.split())
         except SystemExit:
             exc_type, exc_value, exc_traceback = sys.exc_info()
@@ -90,7 +90,7 @@ class ShellTest(testtools.TestCase):
         return out
 
     def test_run_unknown_command(self):
-        openstack_shell.QuantumShell('2.0').run('fake')
+        openstack_shell.NeutronShell('2.0').run('fake')
 
     def test_help(self):
         required = 'usage:'
@@ -126,13 +126,13 @@ class ShellTest(testtools.TestCase):
                    ' --os-auth-strategy keystone quota-list')
 
     def test_build_option_parser(self):
-        quant_shell = openstack_shell.QuantumShell('2.0')
-        result = quant_shell.build_option_parser('descr', '2.0')
+        neutron_shell = openstack_shell.NeutronShell('2.0')
+        result = neutron_shell.build_option_parser('descr', '2.0')
         self.assertEqual(True, isinstance(result, argparse.ArgumentParser))
 
     def test_main_with_unicode(self):
-        self.mox.StubOutClassWithMocks(openstack_shell, 'QuantumShell')
-        qshell_mock = openstack_shell.QuantumShell('2.0')
+        self.mox.StubOutClassWithMocks(openstack_shell, 'NeutronShell')
+        qshell_mock = openstack_shell.NeutronShell('2.0')
         #self.mox.StubOutWithMock(qshell_mock, 'run')
         unicode_text = u'\u7f51\u7edc'
         argv = ['net-list', unicode_text, unicode_text.encode('utf-8')]
@@ -145,7 +145,7 @@ class ShellTest(testtools.TestCase):
         self.assertEqual(ret, 0)
 
     def test_endpoint_option(self):
-        shell = openstack_shell.QuantumShell('2.0')
+        shell = openstack_shell.NeutronShell('2.0')
         parser = shell.build_option_parser('descr', '2.0')
 
         # Neither $OS_ENDPOINT_TYPE nor --endpoint-type
@@ -161,7 +161,7 @@ class ShellTest(testtools.TestCase):
                                                "public")
         self.useFixture(fixture)
 
-        shell = openstack_shell.QuantumShell('2.0')
+        shell = openstack_shell.NeutronShell('2.0')
         parser = shell.build_option_parser('descr', '2.0')
 
         # $OS_ENDPOINT_TYPE but not --endpoint-type
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index d7d1520..e9b4d42 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -19,8 +19,8 @@ import sys
 
 import testtools
 
-from quantumclient.common import exceptions
-from quantumclient.common import utils
+from neutronclient.common import exceptions
+from neutronclient.common import utils
 
 
 class TestUtils(testtools.TestCase):