Add template attr. for subnet, router create in Nuage plugin

subnet create and router create commands now gives the ability
to the user to create subnets and routers via neutron cli with
additional attributes nuage_subnet_template and nuage_router_template
respectively. The instantiated subnet and router inherits the properties
of the template that was mentioned in the additional parameters.

Change-Id: Ib73313e840cb35ede89df858baa536aab883efa2
Closes-Bug: #1353112

diff --git a/neutron/plugins/nuage/extensions/nuage_router.py b/neutron/plugins/nuage/extensions/nuage_router.py
index 55d4e58d346e8bc15ed7c6d4897bc02d74e84d32..ebf6a456a99a351db9007e8152e85820849460ce 100644 (file)
--- a/neutron/plugins/nuage/extensions/nuage_router.py
+++ b/neutron/plugins/nuage/extensions/nuage_router.py
@@ -38,6 +38,13 @@ EXTENDED_ATTRIBUTES_2_0 = {
             'default': None,
             'validate': {'type:string_or_none': None}
         },
+        'nuage_router_template': {
+            'allow_post': True,
+            'allow_put': False,
+            'is_visible': True,
+            'default': None,
+            'validate': {'type:uuid_or_none': None}
+        },
     },
 }
 

diff --git a/neutron/plugins/nuage/extensions/nuage_subnet.py b/neutron/plugins/nuage/extensions/nuage_subnet.py
index b3705d5f68e66b78803f737447c4051c367bd043..c41b246112313d0cccdc42f7e658ad80c4525a5c 100644 (file)
--- a/neutron/plugins/nuage/extensions/nuage_subnet.py
+++ b/neutron/plugins/nuage/extensions/nuage_subnet.py
@@ -24,6 +24,13 @@ EXTENDED_ATTRIBUTES_2_0 = {
             'default': None,
             'validate': {'type:string_or_none': None}
         },
+        'nuage_subnet_template': {
+            'allow_post': True,
+            'allow_put': False,
+            'is_visible': True,
+            'default': None,
+            'validate': {'type:uuid_or_none': None}
+        },
     },
 }
 

diff --git a/neutron/plugins/nuage/plugin.py b/neutron/plugins/nuage/plugin.py
index f64e587f951a972e68090ded6d862d939b858c2a..23119f2b017422c28d23c8e31e40408733ab5601 100644 (file)
--- a/neutron/plugins/nuage/plugin.py
+++ b/neutron/plugins/nuage/plugin.py
@@ -508,12 +508,14 @@ class NuagePlugin(db_base_plugin_v2.NeutronDbPluginV2,
             self._add_nuage_sharedresource(subn, net_id, type)
             return subn
 
-    def _create_nuage_subnet(self, context, neutron_subnet, netpart_id):
+    def _create_nuage_subnet(self, context, neutron_subnet,
+                             netpart_id, l2dom_template_id):
         net = netaddr.IPNetwork(neutron_subnet['cidr'])
         params = {
             'netpart_id': netpart_id,
             'tenant_id': neutron_subnet['tenant_id'],
-            'net': net
+            'net': net,
+            'l2dom_tmplt_id': l2dom_template_id
         }
         try:
             nuage_subnet = self.nuageclient.create_subnet(neutron_subnet,
@@ -551,7 +553,8 @@ class NuagePlugin(db_base_plugin_v2.NeutronDbPluginV2,
         net_partition = self._get_net_partition_for_subnet(context, subn)
         neutron_subnet = super(NuagePlugin, self).create_subnet(context,
                                                                 subnet)
-        self._create_nuage_subnet(context, neutron_subnet, net_partition['id'])
+        self._create_nuage_subnet(context, neutron_subnet, net_partition['id'],
+                                  subn['nuage_subnet_template'])
         return neutron_subnet
 
     def delete_subnet(self, context, id):

diff --git a/neutron/tests/unit/nuage/test_nuage_plugin.py b/neutron/tests/unit/nuage/test_nuage_plugin.py
index 332494c4898e19aa6f443e27087b2ce40d785925..d79933b130d41863d1259b3167415627544ba01c 100644 (file)
--- a/neutron/tests/unit/nuage/test_nuage_plugin.py
+++ b/neutron/tests/unit/nuage/test_nuage_plugin.py
@@ -15,6 +15,7 @@
 # @author: Ronak Shah, Aniket Dandekar, Nuage Networks, Alcatel-Lucent USA Inc.
 
 import contextlib
+import copy
 import os
 
 import mock
@@ -22,14 +23,18 @@ from oslo.config import cfg
 from webob import exc
 
 from neutron.extensions import external_net
+from neutron.extensions import l3
 from neutron.extensions import portbindings
+from neutron.openstack.common import uuidutils
 from neutron.plugins.nuage import extensions
+from neutron.plugins.nuage.extensions import nuage_router
 from neutron.plugins.nuage import plugin as nuage_plugin
 from neutron.tests.unit import _test_extension_portbindings as test_bindings
 from neutron.tests.unit.nuage import fake_nuageclient
 from neutron.tests.unit import test_db_plugin
 from neutron.tests.unit import test_extension_extraroute as extraroute_test
 from neutron.tests.unit import test_extension_security_group as test_sg
+from neutron.tests.unit import test_extensions
 from neutron.tests.unit import test_l3_plugin
 
 API_EXT_PATH = os.path.dirname(extensions.__file__)
@@ -229,6 +234,18 @@ class TestNuageSubnetsV2(NuagePluginV2TestCase,
         self.skipTest("Plugin does not support Neutron "
                       "Subnet no-gateway option")
 
+    def test_create_subnet_with_nuage_subnet_template(self):
+        with self.network() as network:
+            nuage_subn_template = uuidutils.generate_uuid()
+            data = {'subnet': {'tenant_id': network['network']['tenant_id']}}
+            data['subnet']['cidr'] = '10.0.0.0/24'
+            data['subnet']['ip_version'] = 4
+            data['subnet']['network_id'] = network['network']['id']
+            data['subnet']['nuage_subnet_template'] = nuage_subn_template
+            subnet_req = self.new_create_request('subnets', data, 'json')
+            subnet_res = subnet_req.get_response(self.api)
+            self.assertEqual(exc.HTTPCreated.code, subnet_res.status_int)
+
 
 class TestNuagePluginPortBinding(NuagePluginV2TestCase,
                                  test_bindings.PortBindingsTestCase):
@@ -255,6 +272,44 @@ class TestNuageL3NatTestCase(NuagePluginV2TestCase,
         self._test_network_update_external_failure()
 
 
+class NuageRouterTestExtensionManager(object):
+
+    def get_resources(self):
+        l3.RESOURCE_ATTRIBUTE_MAP['routers'].update(
+            nuage_router.EXTENDED_ATTRIBUTES_2_0['routers'])
+        return l3.L3.get_resources()
+
+    def get_actions(self):
+        return []
+
+    def get_request_extensions(self):
+        return []
+
+
+class TestNuageRouterExtTestCase(NuagePluginV2TestCase):
+
+    def setUp(self):
+        self._l3_attribute_map_bk = copy.deepcopy(l3.RESOURCE_ATTRIBUTE_MAP)
+        ext_mgr = NuageRouterTestExtensionManager()
+        super(TestNuageRouterExtTestCase, self).setUp(plugin=_plugin_name,
+                                                      ext_mgr=ext_mgr)
+        self.ext_api = test_extensions.setup_extensions_middleware(ext_mgr)
+        self.addCleanup(self.restore_l3_attribute_map)
+
+    def restore_l3_attribute_map(self):
+        l3.RESOURCE_ATTRIBUTE_MAP = self._l3_attribute_map_bk
+
+    def test_router_create_with_nuage_rtr_template(self):
+        nuage_rtr_template = uuidutils.generate_uuid()
+        data = {'router': {'tenant_id': uuidutils.generate_uuid()}}
+        data['router']['name'] = 'router1'
+        data['router']['admin_state_up'] = True
+        data['router']['nuage_router_template'] = nuage_rtr_template
+        router_req = self.new_create_request('routers', data, 'json')
+        router_res = router_req.get_response(self.ext_api)
+        self.assertEqual(exc.HTTPCreated.code, router_res.status_int)
+
+
 class TestNuageExtrarouteTestCase(NuagePluginV2TestCase,
                                   extraroute_test.ExtraRouteDBIntTestCase):