Rename Nicira NVP to VMware NSX in neutronclient

Use new naming scheme to reflect rebranding.

Partial-implements blueprint nicira-plugin-renaming

Change-Id: I694fbda1c228e92a0b910358523787fa742d9ab2

neutronclient/common/__init__.py

@@ -1,5 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2011 Nicira Networks, Inc.
+# Copyright 2011 VMware, Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -13,7 +12,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-# @author: Somik Behera, Nicira Networks, Inc.
 
 import gettext
 

neutronclient/common/exceptions.py

@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011 Nicira Networks, Inc
+# Copyright 2011 VMware, Inc
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

neutronclient/common/utils.py

@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2011, Nicira Networks, Inc.
+# Copyright 2011, VMware, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -16,7 +16,6 @@
 #
 # Borrowed from nova code base, more utilities will be added/borrowed as and
 # when needed.
-# @author: Somik Behera, Nicira Networks, Inc.
 
 """Utilities and helper functions."""
 

neutronclient/neutron/v2_0/nsx/qos_queue.py

@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2013 Nicira Inc.
+# Copyright 2013 VMware Inc.
 # All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

neutronclient/neutron/v2_0/router.py

@@ -70,7 +70,7 @@ class CreateRouter(neutronV20.CreateCommand):
             help=_('Name of router to create'))
         parser.add_argument(
             'distributed', action='store_true',
-            help=_('Create a distributed router (Nicira plugin only)'))
+            help=_('Create a distributed router (VMware NSX plugin only)'))
 
     def args2body(self, parsed_args):
         body = {'router': {

neutronclient/shell.py

@@ -45,8 +45,8 @@ from neutronclient.neutron.v2_0.lb import vip as lb_vip
 from neutronclient.neutron.v2_0 import metering
 from neutronclient.neutron.v2_0 import network
 from neutronclient.neutron.v2_0 import networkprofile
-from neutronclient.neutron.v2_0 import nvp_qos_queue
-from neutronclient.neutron.v2_0 import nvpnetworkgateway
+from neutronclient.neutron.v2_0.nsx import networkgateway
+from neutronclient.neutron.v2_0.nsx import qos_queue
 from neutronclient.neutron.v2_0 import policyprofile
 from neutronclient.neutron.v2_0 import port
 from neutronclient.neutron.v2_0 import quota
@@ -167,21 +167,21 @@ COMMAND_V2 = {
     'lb-healthmonitor-disassociate': (
         lb_healthmonitor.DisassociateHealthMonitor
     ),
-    'queue-create': nvp_qos_queue.CreateQoSQueue,
-    'queue-delete': nvp_qos_queue.DeleteQoSQueue,
-    'queue-show': nvp_qos_queue.ShowQoSQueue,
-    'queue-list': nvp_qos_queue.ListQoSQueue,
+    'queue-create': qos_queue.CreateQoSQueue,
+    'queue-delete': qos_queue.DeleteQoSQueue,
+    'queue-show': qos_queue.ShowQoSQueue,
+    'queue-list': qos_queue.ListQoSQueue,
     'agent-list': agent.ListAgent,
     'agent-show': agent.ShowAgent,
     'agent-delete': agent.DeleteAgent,
     'agent-update': agent.UpdateAgent,
-    'net-gateway-create': nvpnetworkgateway.CreateNetworkGateway,
-    'net-gateway-update': nvpnetworkgateway.UpdateNetworkGateway,
-    'net-gateway-delete': nvpnetworkgateway.DeleteNetworkGateway,
-    'net-gateway-show': nvpnetworkgateway.ShowNetworkGateway,
-    'net-gateway-list': nvpnetworkgateway.ListNetworkGateway,
-    'net-gateway-connect': nvpnetworkgateway.ConnectNetworkGateway,
-    'net-gateway-disconnect': nvpnetworkgateway.DisconnectNetworkGateway,
+    'net-gateway-create': networkgateway.CreateNetworkGateway,
+    'net-gateway-update': networkgateway.UpdateNetworkGateway,
+    'net-gateway-delete': networkgateway.DeleteNetworkGateway,
+    'net-gateway-show': networkgateway.ShowNetworkGateway,
+    'net-gateway-list': networkgateway.ListNetworkGateway,
+    'net-gateway-connect': networkgateway.ConnectNetworkGateway,
+    'net-gateway-disconnect': networkgateway.DisconnectNetworkGateway,
     'dhcp-agent-network-add': agentscheduler.AddNetworkToDhcpAgent,
     'dhcp-agent-network-remove': agentscheduler.RemoveNetworkFromDhcpAgent,
     'net-list-on-dhcp-agent': agentscheduler.ListNetworksOnDhcpAgent,

neutronclient/tests/unit/test_cli20_nsx_networkgateway.py

@@ -1,4 +1,4 @@
-# Copyright 2012 Nicira, Inc
+# Copyright 2012 VMware, Inc
 # All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -17,7 +17,7 @@
 
 import sys
 
-from neutronclient.neutron.v2_0 import nvpnetworkgateway as nwgw
+from neutronclient.neutron.v2_0.nsx import networkgateway as nwgw
 from neutronclient.tests.unit import test_cli20
 
 

neutronclient/tests/unit/test_cli20_nsx_queue.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2013 Nicira Inc.
+# Copyright 2013 VMware Inc.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -18,13 +18,13 @@
 
 import sys
 
-from neutronclient.neutron.v2_0 import nvp_qos_queue as qos
+from neutronclient.neutron.v2_0.nsx import qos_queue as qos
 from neutronclient.tests.unit import test_cli20
 
 
-class CLITestV20NvpQosQueueJSON(test_cli20.CLITestV20Base):
+class CLITestV20QosQueueJSON(test_cli20.CLITestV20Base):
     def setUp(self):
-        super(CLITestV20NvpQosQueueJSON, self).setUp(
+        super(CLITestV20QosQueueJSON, self).setUp(
             plurals={'qos_queues': 'qos_queue'})
 
     def test_create_qos_queue(self):
@@ -84,5 +84,5 @@ class CLITestV20NvpQosQueueJSON(test_cli20.CLITestV20Base):
         self._test_delete_resource(resource, cmd, myid, args)
 
 
-class CLITestV20NvpQosQueueXML(CLITestV20NvpQosQueueJSON):
+class CLITestV20QosQueueXML(CLITestV20QosQueueJSON):
     format = 'xml'

neutronclient/tests/unit/test_cli20_router.py

@@ -1,4 +1,4 @@
-# Copyright 2012 Nicira, Inc
+# Copyright 2012 VMware, Inc
 # All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may