Bug 872: Change cirros nsd to use mgmtnet as managment vld

[osm/devops.git] / descriptor-packages / nsd / cirros_ns / src / cirros_nsd.yaml

diff --git a/descriptor-packages/nsd/cirros_ns/src/cirros_nsd.yaml b/descriptor-packages/nsd/cirros_ns/src/cirros_nsd.yaml
index 9ec4e27..878eac0 100644 (file)
--- a/descriptor-packages/nsd/cirros_ns/src/cirros_nsd.yaml
+++ b/descriptor-packages/nsd/cirros_ns/src/cirros_nsd.yaml
@@ -1,4 +1,22 @@
-nsd:nsd-catalog:
+##
+# Copyright 2019 ETSI
+#
+# All Rights Reserved.
+#
+# 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
+# a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+##
+
+nsd-catalog:
     nsd:
     -   id: cirros_nsd
         name: cirros_ns
@@ -31,19 +49,19 @@ nsd:nsd-catalog:
                 name: manual_scale
         vld:
         # Networks for the VNFs
-            -   id: cirros_nsd_vld1
-                name: cirros_nsd_vld1
+            -   id: mgmtnet
+                name: mgmtnet
                 type: ELAN
+                mgmt-network: 'true'
                 # vim-network-name: <update>
                 # provider-network:
-                #     overlay-type: VLAN
                 #     segmentation_id: <update>
                 vnfd-connection-point-ref:
                 # Specify the constituent VNFs
                 # member-vnf-index-ref - entry from constituent vnf
                 # vnfd-id-ref - VNFD id
                 # vnfd-connection-point-ref - connection point name in the VNFD
-                -   nsd:member-vnf-index-ref: 1
-                    nsd:vnfd-id-ref: cirros_vnfd
+                -   member-vnf-index-ref: 1
+                    vnfd-id-ref: cirros_vnfd
                     # NOTE: Validate the entry below
-                    nsd:vnfd-connection-point-ref: eth0
+                    vnfd-connection-point-ref: eth0