Include 4.1.1 vduCp in deployment

Node type was already added, but not include in the list of types to be deployed during install or upgrade

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-3509
Change-Id: I71a3a9942cb7d5b6adb194b7e7f2aa4be6533ac6

diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.yml
index 5d1db02..622f5ed 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.yml
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/4.1.1/vduCp/vduCp.yml
@@ -27,7 +27,7 @@ node_types:
           description: Describes the type of the virtual network interface realizing the CPs instantiated from this CPD
           required: false
           constraints:
-          - valid_values: [ normal, macvtap, direct, baremetal, virtio-forwarder, direct-physical, smart-nic, bridge, ipvlan, loopback, macvlan, ptp, vlan, host-device ] 
+          - valid_values: [ normal, macvtap, direct, baremetal, virtio, virtio-forwarder, direct-physical, smart-nic, bridge, ipvlan, loopback, macvlan, ptp, vlan, host-device ] 
       requirements:
         - virtual_link:
             capability: tosca.capabilities.nfv.VirtualLinkable

diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/data/onapTypesToUpgrade.json b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/data/onapTypesToUpgrade.json
index 8167b09..96c30e2 100644 (file)
--- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/data/onapTypesToUpgrade.json
+++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/data/onapTypesToUpgrade.json
@@ -25,6 +25,7 @@
     "VNF",
     "osContainer",
     "osContainerGroup",
+    "vduCp",
     "virtualCp"
   ],
   "onap": [

diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py
index b6cfb9e..0ee2d6c 100644 (file)
--- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py
+++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py
@@ -138,6 +138,7 @@ def get_nfv_4_1_1(base_file_location="/"):
                                   ["VNF",
                                    "osContainer",
                                    "osContainerGroup",
+                                   "vduCp",
                                    "virtualCp"])
 
 def get_onap(base_file_location="/"):