Merge "Add vIMS heat template in demo repository"
authorGary Wu <gary.i.wu@huawei.com>
Fri, 26 Apr 2019 17:14:45 +0000 (17:14 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 26 Apr 2019 17:14:45 +0000 (17:14 +0000)
tosca/vCPE/infra/MainServiceTemplate.yaml
tosca/vCPE/infra/MainServiceTemplate_sriov.yaml
tosca/vCPE/vbng/MainServiceTemplate.yaml
tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml
tosca/vCPE/vbrgemu/MainServiceTemplate.yaml
tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml
tosca/vCPE/vgmux/MainServiceTemplate.yaml
tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml
tosca/vCPE/vgw/MainServiceTemplate.yaml
tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
vnfs/VESreporting_vFW5.0/go-client.sh

index 66e8451..7b44e83 100644 (file)
@@ -3,6 +3,7 @@ metadata:
   template_name: vCPE_infra
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_infra
 
 imports:
@@ -173,7 +174,7 @@ topology_template:
 #            root: 10000000
 #            leaf: 10000000
 #          min_bitrate_requirements:
-#            root 10000000
+#            root: 10000000
 #            leaf: 10000000
 #          virtual_link_protocol_data:
 #            - associated_layer_protocol: ipv4
index 31c18f5..ca34333 100644 (file)
@@ -3,6 +3,7 @@ metadata:
   template_name: vCPE_infra
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_infra
 
 imports:
@@ -166,79 +167,95 @@ topology_template:
 #      type: tosca.nodes.nfv.VnfVirtualLink
 #      properties:
 #        connectivity_type:
-#          layer_protocol: ipv4
+#          layer_protocols: [ipv4]
 #        vl_profile:
-#          max_bit_rate_requirements:
+#          max_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          min_bit_rate_requirements:
+#          min_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          networkName: { get_input: public_net_id }
+#          virtual_link_protocol_data:
+#            - associated_layer_protocol: ipv4
+#              l3_protocol_data:
+#                ip_version: ipv4
+#                name: { get_input: public_net_id }
 #
 #    #onap oam net
 #    VL_onap_private:
 #      type: tosca.nodes.nfv.VnfVirtualLink
 #      properties:
 #        connectivity_type:
-#          layer_protocol: ipv4
+#          layer_protocols: [ipv4]
 #        vl_profile:
-#          max_bit_rate_requirements:
+#          max_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          min_bit_rate_requirements:
+#          min_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          networkName: { get_input: onap_private_net_id }
-#          cidr: { get_input: onap_private_net_cidr }
+#          virtual_link_protocol_data:
+#            - associated_layer_protocol: ipv4
+#              l3_protocol_data:
+#                ip_version: ipv4
+#                name: { get_input: onap_private_net_id }
+#                cidr: { get_input: onap_private_net_cidr }
 
     #cpe signal network
     VL_cpe_signal:
       type: tosca.nodes.nfv.VnfVirtualLink
       properties:
         connectivity_type:
-          layer_protocol: ipv4
+          layer_protocols: [ipv4]
         vl_profile:
-          max_bit_rate_requirements:
+          max_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          min_bit_rate_requirements:
+          min_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          networkName: { get_input: cpe_signal_net_id}
-          cidr: { get_input: cpe_signal_net_cidr }
-          dhcpEnabled: false
+          virtual_link_protocol_data:
+            - associated_layer_protocol: ipv4
+              l3_protocol_data:
+                ip_version: ipv4
+                name: { get_input: cpe_signal_net_id}
+                cidr: { get_input: cpe_signal_net_cidr }
+                dhcp_enabled: false
 
     #cpe public network
     VL_cpe_public:
       type: tosca.nodes.nfv.VnfVirtualLink
       properties:
         connectivity_type:
-          layer_protocol: ipv4
+          layer_protocols: [ipv4]
         vl_profile:
-          max_bit_rate_requirements:
+          max_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          min_bit_rate_requirements:
+          min_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          networkName: { get_input: cpe_public_net_id}
-          cidr: { get_input: cpe_public_net_cidr }
-          dhcpEnabled: false
+          virtual_link_protocol_data:
+            - associated_layer_protocol: ipv4
+              l3_protocol_data:
+                ip_version: ipv4
+                name: { get_input: cpe_public_net_id}
+                cidr: { get_input: cpe_public_net_cidr }
+                dhcp_enabled: false
 
     # vaaa related
     Cp_vaaa_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
       requirements:
         - virtual_binding: VDU_vaaa_0
 #        - virtual_link: VL_public
@@ -246,17 +263,17 @@ topology_template:
     Cp_vaaa_onap_private:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vaaa_private_ip_1 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vaaa_private_ip_1 }
       requirements:
         - virtual_binding: VDU_vaaa_0
 #        - virtual_link: VL_onap_private
@@ -264,35 +281,26 @@ topology_template:
     Cp_vaaa_cpe_signal:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vaaa_private_ip_0 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vaaa_private_ip_0 }
       requirements:
         - virtual_binding: VDU_vaaa_0
         - virtual_link: VL_cpe_signal
 
-    VirtualStorage_root_all:
-      # this indicate the VDU root storage size
-      type: tosca.nodes.nfv.Vdu.VirtualStorage
-      properties:
-        type_of_storage: root
-        size_of_storage: 40 GB
-
     VDU_vaaa_0:
       type: tosca.nodes.nfv.Vdu.Compute
       properties:
         name: { get_input: vaaa_name_0 }
         description: vaaa
-        configurable_properties:
-          additional_vnfc_configurable_properties: {}
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 1
@@ -313,7 +321,7 @@ topology_template:
           install_script_version: { get_input: install_script_version }
           cloud_env: { get_input: cloud_env }
           nexus_artifact_repo: { get_input: nexus_artifact_repo }
-        user_data: |
+        boot_data: |
           #!/bin/bash
           METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
           apt-get -y install jq
@@ -348,13 +356,12 @@ topology_template:
       capabilities:
         virtual_compute:
           properties:
-            #TODO add local disk size
             virtual_memory:
               virtual_mem_size: 4096 MB
             virtual_cpu:
               num_virtual_cpu: 2
-      requirements:
-        - virtual_storage: VirtualStorage_root_all
+            virtual_local_storage:
+              - size_of_storage: 40 GB
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
@@ -365,15 +372,15 @@ topology_template:
     Cp_vdns_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
       requirements:
         - virtual_binding: VDU_vdns_0
 #        - virtual_link: VL_public
@@ -381,17 +388,17 @@ topology_template:
     Cp_vdns_onap_private:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vdns_private_ip_1 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vdns_private_ip_1 }
       requirements:
         - virtual_binding: VDU_vdns_0
         #- virtual_link: VL_onap_private
@@ -399,17 +406,17 @@ topology_template:
     Cp_vdns_cpe_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vdns_private_ip_0 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vdns_private_ip_0 }
       requirements:
         - virtual_binding: VDU_vdns_0
         - virtual_link: VL_cpe_public
@@ -419,8 +426,6 @@ topology_template:
       properties:
         name: { get_input: vdns_name_0 }
         description: vdns
-        configurable_properties:
-          additional_vnfc_configurable_properties: {}
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 1
@@ -439,7 +444,7 @@ topology_template:
           install_script_version: { get_input: install_script_version }
           cloud_env: { get_input: cloud_env }
           nexus_artifact_repo: { get_input: nexus_artifact_repo }
-        user_data: |
+        boot_data: |
           #!/bin/bash
           METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
           apt-get -y install jq
@@ -472,13 +477,12 @@ topology_template:
       capabilities:
         virtual_compute:
           properties:
-            #TODO add local disk size
             virtual_memory:
               virtual_mem_size: 4096 MB
             virtual_cpu:
               num_virtual_cpu: 2
-      requirements:
-        - virtual_storage: VirtualStorage_root_all
+            virtual_local_storage:
+              - size_of_storage: 40 GB
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
@@ -489,15 +493,15 @@ topology_template:
     Cp_vdhcp_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
       requirements:
         - virtual_binding: VDU_vdhcp_0
 #        - virtual_link: VL_public
@@ -505,17 +509,17 @@ topology_template:
     Cp_vdhcp_onap_private:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vdhcp_private_ip_1 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vdhcp_private_ip_1 }
       requirements:
         - virtual_binding: VDU_vdhcp_0
 #        - virtual_link: VL_onap_private
@@ -523,17 +527,17 @@ topology_template:
     Cp_vdhcp_cpe_signal:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vdhcp_private_ip_0 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vdhcp_private_ip_0 }
       requirements:
         - virtual_binding: VDU_vdhcp_0
         - virtual_link: VL_cpe_signal
@@ -543,8 +547,6 @@ topology_template:
       properties:
         name: { get_input: vdhcp_name_0 }
         description: vdhcp
-        configurable_properties:
-          additional_vnfc_configurable_properties: {}
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 1
@@ -565,7 +567,7 @@ topology_template:
           install_script_version: { get_input: install_script_version }
           cloud_env: { get_input: cloud_env }
           nexus_artifact_repo: { get_input: nexus_artifact_repo }
-        user_data: |
+        boot_data: |
           #!/bin/bash
           METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
           apt-get -y install jq
@@ -600,13 +602,12 @@ topology_template:
       capabilities:
         virtual_compute:
           properties:
-            #TODO add local disk size
             virtual_memory:
               virtual_mem_size: 4096 MB
             virtual_cpu:
               num_virtual_cpu: 2
-      requirements:
-        - virtual_storage: VirtualStorage_root_all
+            virtual_local_storage:
+              - size_of_storage: 40 GB
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
@@ -617,15 +618,15 @@ topology_template:
     Cp_vweb_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
       requirements:
         - virtual_binding: VDU_vweb_0
 #        - virtual_link: VL_public
@@ -633,17 +634,17 @@ topology_template:
     Cp_vweb_onap_private:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vweb_private_ip_1 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vweb_private_ip_1 }
       requirements:
         - virtual_binding: VDU_vweb_0
 #        - virtual_link: VL_onap_private
@@ -651,17 +652,17 @@ topology_template:
     Cp_vweb_cpe_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vweb_private_ip_0 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vweb_private_ip_0 }
       requirements:
         - virtual_binding: VDU_vweb_0
         - virtual_link: VL_cpe_public
@@ -671,8 +672,6 @@ topology_template:
       properties:
         name: { get_input: vweb_name_0 }
         description: vweb
-        configurable_properties:
-          additional_vnfc_configurable_properties: {}
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 1
@@ -691,7 +690,7 @@ topology_template:
           install_script_version: { get_input: install_script_version }
           cloud_env: { get_input: cloud_env }
           nexus_artifact_repo: { get_input: nexus_artifact_repo }
-        user_data: |
+        boot_data: |
           #!/bin/bash
           METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
           apt-get -y install jq
@@ -724,13 +723,12 @@ topology_template:
       capabilities:
         virtual_compute:
           properties:
-            #TODO add local disk size
             virtual_memory:
               virtual_mem_size: 4096 MB
             virtual_cpu:
               num_virtual_cpu: 2
-      requirements:
-        - virtual_storage: VirtualStorage_root_all
+            virtual_local_storage:
+              - size_of_storage: 40 GB
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
index d1ee7a1..f4b7633 100644 (file)
@@ -3,6 +3,7 @@ metadata:
   template_name: vCPE_vbng
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_vbng
 
 imports:
index f04cd98..99d217b 100644 (file)
@@ -3,6 +3,7 @@ metadata:
   template_name: vCPE_vbng
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_vbng
 
 imports:
@@ -134,98 +135,120 @@ topology_template:
 #      type: tosca.nodes.nfv.VnfVirtualLink
 #      properties:
 #        connectivity_type:
-#          layer_protocol: ipv4
+#          layer_protocols: [ipv4]
 #        vl_profile:
-#          max_bit_rate_requirements:
+#          max_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          min_bit_rate_requirements:
+#          min_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          networkName: { get_input: public_net_id }
+#          virtual_link_protocol_data:
+#            - associated_layer_protocol: ipv4
+#              l3_protocol_data:
+#                ip_version: ipv4
+#                name: { get_input: public_net_id }
 #
 #    #onap oam net
 #    VL_onap_private:
 #      type: tosca.nodes.nfv.VnfVirtualLink
 #      properties:
 #        connectivity_type:
-#          layer_protocol: ipv4
+#          layer_protocols: [ipv4]
 #        vl_profile:
-#          max_bit_rate_requirements:
+#          max_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          min_bit_rate_requirements:
+#          min_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          networkName: { get_input: onap_private_net_id }
-#          cidr: { get_input: onap_private_net_cidr }
+#          virtual_link_protocol_data:
+#            - associated_layer_protocol: ipv4
+#              l3_protocol_data:
+#                ip_version: ipv4
+#                name: { get_input: onap_private_net_id }
+#                cidr: { get_input: onap_private_net_cidr }
 
     #Private network that connects vBRG to vBNG
     VL_brgemu_bng_private_net:
       type: tosca.nodes.nfv.VnfVirtualLink
       properties:
         connectivity_type:
-          layer_protocol: ipv4
+          layer_protocols: [ipv4]
         vl_profile:
-          max_bit_rate_requirements:
+          max_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          min_bit_rate_requirements:
+          min_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          networkName: { get_input: brgemu_bng_private_net_id}
-          cidr: { get_input: brgemu_bng_private_net_cidr }
-          dhcpEnabled: false
-          physicalNetwork: "physnet1"
+          virtual_link_protocol_data:
+            - associated_layer_protocol: ipv4
+              l3_protocol_data:
+                ip_version: ipv4
+                name: { get_input: brgemu_bng_private_net_id}
+                cidr: { get_input: brgemu_bng_private_net_cidr }
+                dhcp_enabled: false
+              l2_protocol_data:
+                physical_network: "physnet1"
 
     #cpe signal network
     VL_cpe_signal:
       type: tosca.nodes.nfv.VnfVirtualLink
       properties:
         connectivity_type:
-          layer_protocol: ipv4
+          layer_protocols: [ipv4]
         vl_profile:
-          max_bit_rate_requirements:
+          max_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          min_bit_rate_requirements:
+          min_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          networkName: { get_input: cpe_signal_net_id}
-          cidr: { get_input: cpe_signal_private_net_cidr }
-          dhcpEnabled: false
+          virtual_link_protocol_data:
+            - associated_layer_protocol: ipv4
+              l3_protocol_data:
+                ip_version: ipv4
+                name: { get_input: cpe_signal_net_id}
+                cidr: { get_input: cpe_signal_private_net_cidr }
+                dhcp_enabled: false
 
     #Private network that connects vBNG to vGMUX
     VL_bng_gmux_private_net:
       type: tosca.nodes.nfv.VnfVirtualLink
       properties:
         connectivity_type:
-          layer_protocol: ipv4
+          layer_protocols: [ipv4]
         vl_profile:
-          max_bit_rate_requirements:
+          max_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          min_bit_rate_requirements:
+          min_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          networkName: { get_input: bng_gmux_private_net_id}
-          cidr: { get_input: bng_gmux_private_net_cidr }
-          dhcpEnabled: false
-          physicalNetwork: "physnet1"
+          virtual_link_protocol_data:
+            - associated_layer_protocol: ipv4
+              l3_protocol_data:
+                ip_version: ipv4
+                name: { get_input: bng_gmux_private_net_id}
+                cidr: { get_input: bng_gmux_private_net_cidr }
+                dhcp_enabled: false
+              l2_protocol_data:
+                physical_network: "physnet1"
 
     # vbng related
     Cp_vbng_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
       requirements:
         - virtual_binding: VDU_vbng_0
         #- virtual_link: VL_public
@@ -233,17 +256,17 @@ topology_template:
     Cp_vbng_onap_private:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vbng_private_ip_1 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vbng_private_ip_1 }
       requirements:
         - virtual_binding: VDU_vbng_0
         #- virtual_link: VL_onap_private
@@ -251,18 +274,18 @@ topology_template:
     Cp_vbng_brgemu_bng_private_net:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vbng_private_ip_0 }
-        vnic_type: "direct"
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vbng_private_ip_0 }
+        vnic_type: "direct-physical"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true
@@ -280,17 +303,17 @@ topology_template:
     Cp_vbng_cpe_signal:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vbng_private_ip_2 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vbng_private_ip_2 }
       requirements:
         - virtual_binding: VDU_vbng_0
         - virtual_link: VL_cpe_signal
@@ -298,18 +321,18 @@ topology_template:
     Cp_vbng_bng_gmux_private_net:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vbng_private_ip_3 }
-        vnic_type: "direct"
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vbng_private_ip_3 }
+        vnic_type: "direct-physical"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true
@@ -324,20 +347,11 @@ topology_template:
         - virtual_binding: VDU_vbng_0
         - virtual_link: VL_bng_gmux_private_net
 
-    VirtualStorage_root_all:
-      # this indicate the VDU root storage size
-      type: tosca.nodes.nfv.Vdu.VirtualStorage
-      properties:
-        type_of_storage: root
-        size_of_storage: 40 GB
-
     VDU_vbng_0:
       type: tosca.nodes.nfv.Vdu.Compute
       properties:
         name: { get_input: vbng_name_0 }
         description: vbng
-        configurable_properties:
-          additional_vnfc_configurable_properties: {}
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 1
@@ -364,7 +378,7 @@ topology_template:
           sdnc_ip: { get_input: sdnc_ip_addr }
           cloud_env: { get_input: cloud_env }
           nexus_artifact_repo: { get_input: nexus_artifact_repo }
-        user_data: |
+        boot_data: |
           #!/bin/bash
           METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
           apt-get -y install jq
@@ -406,15 +420,14 @@ topology_template:
           properties:
             virtual_memory:
               virtual_mem_size: 4096 MB
-              # HPA requirements
-              vdu_memory_requirements:
+              vdu_mem_requirements:
                 memoryPageSize: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "2 MB"}'
                 numberOfPages: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1024"}'
             virtual_cpu:
               num_virtual_cpu: 2
               cpu_architecture: generic
-      requirements:
-        - virtual_storage: VirtualStorage_root_all
+            virtual_local_storage:
+              - size_of_storage: 40 GB
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
index 1e4a36e..e337008 100644 (file)
@@ -3,6 +3,7 @@ metadata:
   template_name: vCPE_vbrgemu
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_vbrgemu
 
 imports:
index 6016190..af778c2 100644 (file)
@@ -3,6 +3,7 @@ metadata:
   template_name: vCPE_vbrgemu
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_vbrgemu
 
 imports:
@@ -100,63 +101,76 @@ topology_template:
 #      type: tosca.nodes.nfv.VnfVirtualLink
 #      properties:
 #        connectivity_type:
-#          layer_protocol: ipv4
+#          layer_protocols: [ipv4]
 #        vl_profile:
-#          max_bit_rate_requirements:
+#          max_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          min_bit_rate_requirements:
+#          min_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          networkName: { get_input: public_net_id }
+#          virtual_link_protocol_data:
+#            - associated_layer_protocol: ipv4
+#              l3_protocol_data:
+#                ip_version: ipv4
+#                name: { get_input: public_net_id }
 #
 #    #onap oam net
 #    VL_onap_private:
 #      type: tosca.nodes.nfv.VnfVirtualLink
 #      properties:
 #        connectivity_type:
-#          layer_protocol: ipv4
+#          layer_protocols: [ipv4]
 #        vl_profile:
-#          max_bit_rate_requirements:
+#          max_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          min_bit_rate_requirements:
+#          min_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          networkName: { get_input: onap_private_net_id }
-#          cidr: { get_input: onap_private_net_cidr }
+#          virtual_link_protocol_data:
+#            - associated_layer_protocol: ipv4
+#              l3_protocol_data:
+#                ip_version: ipv4
+#                name: { get_input: onap_private_net_id }
+#                cidr: { get_input: onap_private_net_cidr }
 
     #Private network that connects vBRGEMU to vBNG
     VL_vbrgemu_bng_private_net:
       type: tosca.nodes.nfv.VnfVirtualLink
       properties:
         connectivity_type:
-          layer_protocol: ipv4
+          layer_protocols: [ipv4]
         vl_profile:
-          max_bit_rate_requirements:
+          max_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          min_bit_rate_requirements:
+          min_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          networkName: { get_input: vbrgemu_bng_private_net_id}
-          cidr: { get_input: vbrgemu_bng_private_net_cidr }
-          dhcpEnabled: false
-          physicalNetwork: "physnet1"
+          virtual_link_protocol_data:
+            - associated_layer_protocol: ipv4
+              l3_protocol_data:
+                ip_version: ipv4
+                name: { get_input: vbrgemu_bng_private_net_id}
+                cidr: { get_input: vbrgemu_bng_private_net_cidr }
+                dhcp_enabled: false
+              l2_protocol_data:
+                physical_network: "physnet1"
 
     # vbrgemu related
     Cp_vbrgemu_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
       requirements:
         - virtual_binding: VDU_vbrgemu_0
         #- virtual_link: VL_public
@@ -164,18 +178,18 @@ topology_template:
     Cp_vbrgemu_vbrgemu_bng_private_net:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vbrgemu_private_ip_0 }
-        vnic_type: "direct"
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vbrgemu_private_ip_0 }
+        vnic_type: "direct-physical"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true
@@ -190,26 +204,17 @@ topology_template:
         - virtual_binding: VDU_vbrgemu_0
         - virtual_link: VL_vbrgemu_bng_private_net
 
-    VirtualStorage_root_all:
-      # this indicate the VDU root storage size
-      type: tosca.nodes.nfv.Vdu.VirtualStorage
-      properties:
-        type_of_storage: root
-        size_of_storage: 40 GB
-
     VDU_vbrgemu_0:
       type: tosca.nodes.nfv.Vdu.Compute
       properties:
         name: { get_input: vbrgemu_name_0 }
         description: vbrgemu
-        configurable_properties:
-          additional_vnfc_configurable_properties: {}
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 1
           watchdog: none
         inject_files: #TODO SDC bug
-          source_path: ../Artifcats/keys/authorized_keys #SSH authorized_keys
+          source_path: ../Artifacts/Deployment/OTHER/authorized_keys #SSH authorized_keys
           dest_path: /home/ubuntu/.ssh/authorized_keys
         meta_data:
           vnf_id: { get_input: vnf_id }
@@ -220,7 +225,7 @@ topology_template:
           sdnc_ip: { get_input: sdnc_ip_addr }
           cloud_env: { get_input: cloud_env }
           nexus_artifact_repo: { get_input: nexus_artifact_repo }
-        user_data: |
+        boot_data: |
           #!/bin/bash
           METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
           apt-get -y install jq
@@ -253,15 +258,14 @@ topology_template:
           properties:
             virtual_memory:
               virtual_mem_size: 4096 MB
-              # HPA requirements
-              vdu_memory_requirements:
+              vdu_mem_requirements:
                 memoryPageSize: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "2 MB"}'
                 numberOfPages: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1024"}'
             virtual_cpu:
               num_virtual_cpu: 2
               cpu_architecture: generic
-      requirements:
-        - virtual_storage: VirtualStorage_root_all
+            virtual_local_storage:
+              - size_of_storage: 40 GB
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
index 2a6385b..dd3e8f2 100644 (file)
@@ -3,6 +3,7 @@ metadata:
   template_name: vCPE_vgmux
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_vgmux
 
 imports:
index ee4f56f..171f878 100644 (file)
@@ -3,12 +3,12 @@ metadata:
   template_name: vCPE_vgmux
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_vgmux
 
 imports:
   - onap_dm.yaml
 
-
 topology_template:
 #  substitution_mappings:
 #    node_type: onap.vcpe_vgmux
@@ -123,81 +123,99 @@ topology_template:
 #      type: tosca.nodes.nfv.VnfVirtualLink
 #      properties:
 #        connectivity_type:
-#          layer_protocol: ipv4
+#          layer_protocols: [ipv4]
 #        vl_profile:
-#          max_bit_rate_requirements:
+#          max_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          min_bit_rate_requirements:
+#          min_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          networkName: { get_input: public_net_id }
+#          virtual_link_protocol_data:
+#            - associated_layer_protocol: ipv4
+#              l3_protocol_data:
+#                ip_version: ipv4
+#                name: { get_input: public_net_id }
 #
 #    #onap oam net
 #    VL_onap_private:
 #      type: tosca.nodes.nfv.VnfVirtualLink
 #      properties:
 #        connectivity_type:
-#          layer_protocol: ipv4
+#          layer_protocols: [ipv4]
 #        vl_profile:
-#          max_bit_rate_requirements:
+#          max_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          min_bit_rate_requirements:
+#          min_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          networkName: { get_input: onap_private_net_id }
-#          cidr: { get_input: onap_private_net_cidr }
+#          virtual_link_protocol_data:
+#            - associated_layer_protocol: ipv4
+#              l3_protocol_data:
+#                ip_version: ipv4
+#                name: { get_input: onap_private_net_id }
+#                cidr: { get_input: onap_private_net_cidr }
 
     #Private network that connects vBNG to vGMUX
     VL_bng_gmux_private_net:
       type: tosca.nodes.nfv.VnfVirtualLink
       properties:
         connectivity_type:
-          layer_protocol: ipv4
+          layer_protocols: [ipv4]
         vl_profile:
-          max_bit_rate_requirements:
+          max_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          min_bit_rate_requirements:
+          min_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          networkName: { get_input: bng_gmux_private_net_id}
-          cidr: { get_input: bng_gmux_private_net_cidr }
-          dhcpEnabled: false
-          physicalNetwork: "physnet1"
+          virtual_link_protocol_data:
+            - associated_layer_protocol: ipv4
+              l3_protocol_data:
+                ip_version: ipv4
+                name: { get_input: bng_gmux_private_net_id}
+                cidr: { get_input: bng_gmux_private_net_cidr }
+                dhcp_enabled: false
+              l2_protocol_data:
+                physical_network: "physnet1"
 
     #Private network that connects vGMUX to vGWs
     VL_mux_gw_private_net:
       type: tosca.nodes.nfv.VnfVirtualLink
       properties:
         connectivity_type:
-          layer_protocol: ipv4
+          layer_protocols: [ipv4]
         vl_profile:
-          max_bit_rate_requirements:
+          max_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          min_bit_rate_requirements:
+          min_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          networkName: { get_input: mux_gw_private_net_id}
-          cidr: { get_input: mux_gw_private_net_cidr }
-          dhcpEnabled: false
-          physicalNetwork: "physnet1"
+          virtual_link_protocol_data:
+            - associated_layer_protocol: ipv4
+              l3_protocol_data:
+                ip_version: ipv4
+                name: { get_input: mux_gw_private_net_id}
+                cidr: { get_input: mux_gw_private_net_cidr }
+                dhcp_enabled: false
+              l2_protocol_data:
+                physical_network: "physnet1"
 
     # vgmux related
     Cp_vgmux_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
       requirements:
         - virtual_binding: VDU_vgmux_0
         #- virtual_link: VL_public
@@ -205,17 +223,17 @@ topology_template:
     Cp_vgmux_onap_private:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vgmux_private_ip_1 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vgmux_private_ip_1 }
       requirements:
         - virtual_binding: VDU_vgmux_0
         #- virtual_link: VL_onap_private
@@ -223,18 +241,18 @@ topology_template:
     Cp_vgmux_bng_gmux_private_net:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vgmux_private_ip_0 }
-        vnic_type: "direct"
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vgmux_private_ip_0 }
+        vnic_type: "direct-physical"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true
@@ -252,18 +270,18 @@ topology_template:
     Cp_vgmux_mux_gw_private_net:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vgmux_private_ip_2 }
-        vnic_type: "direct"
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vgmux_private_ip_2 }
+        vnic_type: "direct-physical"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true
@@ -278,20 +296,11 @@ topology_template:
         - virtual_binding: VDU_vgmux_0
         - virtual_link: VL_mux_gw_private_net
 
-    VirtualStorage_root_all:
-      # this indicate the VDU root storage size
-      type: tosca.nodes.nfv.Vdu.VirtualStorage
-      properties:
-        type_of_storage: root
-        size_of_storage: 40 GB
-
     VDU_vgmux_0:
       type: tosca.nodes.nfv.Vdu.Compute
       properties:
         name: { get_input: vgmux_name_0 }
         description: vgmux
-        configurable_properties:
-          additional_vnfc_configurable_properties: {}
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 1
@@ -313,7 +322,7 @@ topology_template:
           install_script_version: { get_input: install_script_version }
           cloud_env: { get_input: cloud_env }
           nexus_artifact_repo: { get_input: nexus_artifact_repo }
-        user_data: |
+        boot_data: |
           #!/bin/bash
           METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
           apt-get -y install jq
@@ -351,15 +360,14 @@ topology_template:
           properties:
             virtual_memory:
               virtual_mem_size: 4096 MB
-              # HPA requirements
-              vdu_memory_requirements:
+              vdu_mem_requirements:
                 memoryPageSize: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "2 MB"}'
                 numberOfPages: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1024"}'
             virtual_cpu:
               num_virtual_cpu: 2
               cpu_architecture: generic
-      requirements:
-        - virtual_storage: VirtualStorage_root_all
+            virtual_local_storage:
+              - size_of_storage: 40 GB
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
index 3fda350..5a8611a 100644 (file)
@@ -3,6 +3,7 @@ metadata:
   template_name: vCPE_vgw
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_vgw
 
 imports:
index 13d2487..4063f95 100644 (file)
@@ -3,6 +3,7 @@ metadata:
   template_name: vCPE_vgw
   template_version: "1.0"
   template_author: onap
+  VNFD_SCHEMA_VERSION: "2.5.1+1"
 description: vCPE_vgw
 
 imports:
@@ -124,80 +125,97 @@ topology_template:
 #      type: tosca.nodes.nfv.VnfVirtualLink
 #      properties:
 #        connectivity_type:
-#          layer_protocol: ipv4
+#          layer_protocols: [ipv4]
 #        vl_profile:
-#          max_bit_rate_requirements:
+#          max_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          min_bit_rate_requirements:
+#          min_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          networkName: { get_input: public_net_id }
+#          virtual_link_protocol_data:
+#            - associated_layer_protocol: ipv4
+#              l3_protocol_data:
+#                ip_version: ipv4
+#                name: { get_input: public_net_id }
 #
 #    #onap oam net
 #    VL_onap_private:
 #      type: tosca.nodes.nfv.VnfVirtualLink
 #      properties:
 #        connectivity_type:
-#          layer_protocol: ipv4
+#          layer_protocols: [ipv4]
 #        vl_profile:
-#          max_bit_rate_requirements:
+#          max_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          min_bit_rate_requirements:
+#          min_bitrate_requirements:
 #            root: 10000000
 #            leaf: 10000000
-#          networkName: { get_input: onap_private_net_id }
-#          cidr: { get_input: onap_private_net_cidr }
+#          virtual_link_protocol_data:
+#            - associated_layer_protocol: ipv4
+#              l3_protocol_data:
+#                ip_version: ipv4
+#                name: { get_input: onap_private_net_id }
+#                cidr: { get_input: onap_private_net_cidr }
 
     #Private network that connects vGMUX to vGWs
     VL_mux_gw_private_net:
       type: tosca.nodes.nfv.VnfVirtualLink
       properties:
         connectivity_type:
-          layer_protocol: ipv4
+          layer_protocols: [ipv4]
         vl_profile:
-          max_bit_rate_requirements:
+          max_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          min_bit_rate_requirements:
+          min_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          networkName: { get_input: mux_gw_private_net_id}
-          cidr: { get_input: mux_gw_private_net_cidr }
-          dhcpEnabled: false
-          physicalNetwork: "physnet1"
+          virtual_link_protocol_data:
+            - associated_layer_protocol: ipv4
+              l3_protocol_data:
+                name: { get_input: mux_gw_private_net_id }
+                ip_version: ipv4
+                cidr: { get_input: mux_gw_private_net_cidr }
+                dhcp_enabled: false
+              l2_protocol_data:
+                physical_network: "physnet1"
 
     #cpe public network
     VL_cpe_public:
       type: tosca.nodes.nfv.VnfVirtualLink
       properties:
         connectivity_type:
-          layer_protocol: ipv4
+          layer_protocols: [ipv4]
         vl_profile:
-          max_bit_rate_requirements:
+          max_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          min_bit_rate_requirements:
+          min_bitrate_requirements:
             root: 10000000
             leaf: 10000000
-          networkName: { get_input: cpe_public_net_id}
-          cidr: { get_input: cpe_public_net_cidr }
-          dhcpEnabled: false
+          virtual_link_protocol_data:
+            - associated_layer_protocol: ipv4
+              l3_protocol_data:
+                name: { get_input: cpe_public_net_id }
+                ip_version: ipv4
+                cidr: { get_input: cpe_public_net_cidr }
+                dhcp_enabled: false
 
     # vgw related
     Cp_vgw_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
       requirements:
         - virtual_binding: VDU_vgw_0
         #- virtual_link: VL_public
@@ -205,17 +223,17 @@ topology_template:
     Cp_vgw_onap_private:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vgw_private_ip_1 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vgw_private_ip_1 }
       requirements:
         - virtual_binding: VDU_vgw_0
         #- virtual_link: VL_onap_private
@@ -223,18 +241,18 @@ topology_template:
     Cp_vgw_mux_gw_private_net:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vgw_private_ip_0 }
-        vnic_type: "direct"
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vgw_private_ip_0 }
+        vnic_type: "direct-physical"
         virtual_network_interface_requirements:
           - name: "sriov-support"
             support_mandatory: true
@@ -252,35 +270,26 @@ topology_template:
     Cp_vgw_cpe_public:
       type: tosca.nodes.nfv.VduCp
       properties:
-        layer_protocol: [ipv4]
+        layer_protocols: [ipv4]
         trunk_mode: false
-        protocol_data:
-          - asscociated_layer_protocol: ipv4
+        protocol:
+          - associated_layer_protocol: ipv4
             address_data:
-              address_type: ip_address
-              l3_address_data:
-                ip_address_assignment: false
-                floating_ip_activated: false
-                fixed_ip_address:
-                  - { get_input: vgw_private_ip_2 }
+              address_type: ip_address
+                l3_address_data:
+                  ip_address_assignment: false
+                  floating_ip_activated: false
+                  fixed_ip_address:
+                    - { get_input: vgw_private_ip_2 }
       requirements:
         - virtual_binding: VDU_vgw_0
         - virtual_link: VL_cpe_public
 
-    VirtualStorage_root_all:
-      # this indicate the VDU root storage size
-      type: tosca.nodes.nfv.Vdu.VirtualStorage
-      properties:
-        type_of_storage: root
-        size_of_storage: 40 GB
-
     VDU_vgw_0:
       type: tosca.nodes.nfv.Vdu.Compute
       properties:
         name: { get_input: vgw_name_0 }
         description: vgw
-        configurable_properties:
-          additional_vnfc_configurable_properties: {}
         vdu_profile:
           min_number_of_instances: 1
           max_number_of_instances: 1
@@ -301,7 +310,7 @@ topology_template:
           install_script_version: { get_input: install_script_version }
           cloud_env: { get_input: cloud_env }
           nexus_artifact_repo: { get_input: nexus_artifact_repo }
-        user_data: |
+        boot_data: |
           #!/bin/bash
           METADATA=`curl -s http://169.254.169.254/openstack/2012-08-10/meta_data.json`
           apt-get -y install jq
@@ -336,18 +345,16 @@ topology_template:
       capabilities:
         virtual_compute:
           properties:
-            #TODO add local disk size
             virtual_memory:
               virtual_mem_size: 4096 MB
-              # HPA requirements
-              vdu_memory_requirements:
+              vdu_mem_requirements:
                 memoryPageSize: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "2 MB"}'
                 numberOfPages: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "1024"}'
             virtual_cpu:
               num_virtual_cpu: 2
               cpu_architecture: generic
-      requirements:
-        - virtual_storage: VirtualStorage_root_all
+            virtual_local_storage:
+              - size_of_storage: 40 GB
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
index 3d1b159..116f890 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH="/opt/VES/libs/x86_64/"
+export LD_LIBRARY_PATH="/opt/VES/evel/evel-library/libs/x86_64/"
 DCAE_COLLECTOR_IP=$(cat /opt/config/dcae_collector_ip.txt)
 DCAE_COLLECTOR_PORT=$(cat /opt/config/dcae_collector_port.txt)
 ./vpp_measurement_reporter $DCAE_COLLECTOR_IP $DCAE_COLLECTOR_PORT eth1