update normative types

add NSD and genericNutronNet

Change-Id: I78784273c019dfb8837223ba390b94c0cfc3f85d
Issue-ID: SDC-410
Signed-off-by: Michael Lando <ml636r@att.com>

diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json
new file mode 100644 (file)
index 0000000..d9b008a
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json
@@ -0,0 +1,21 @@
+{
+  "payloadName": "genericNeutronNet.yml",
+  "contactId": "jh0003",
+  "name": "Generic NeutronNet",
+  "description": "Generic NeutronNet",
+  "resourceIconPath": "network",
+  "resourceType": "VL",
+  "categories": [
+  {
+    "name": "Generic",
+    "subcategories": [
+      {
+        "name": "Network Elements"
+      }
+    ]
+  }
+],
+  "tags": [
+    "Generic NeutronNet"
+  ]
+}
\ No newline at end of file

diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml
new file mode 100644 (file)
index 0000000..12dc13e
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml
@@ -0,0 +1,36 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+node_types:
+  org.openecomp.resource.vl.GenericNeutronNet:
+    derived_from: org.openecomp.resource.vl.extVL
+    description: Generic Neutron Network
+    properties:
+      network_role:
+        type: string
+        description: |
+          Unique label that defines the role that this network performs. example: vce oam network, vnat sr-iov1 network
+      network_assignments:
+        type: org.openecomp.datatypes.network.NetworkAssignments
+      network_flows:
+        type: org.openecomp.datatypes.network.NetworkFlows
+      network_scope:
+        type: string
+      network_ecomp_naming:
+        type: org.openecomp.datatypes.EcompNaming
+      network_type:
+        type: string
+        description: ECOMP supported network types.
+        default: NEUTRON
+      provider_network:
+        type: org.openecomp.datatypes.network.ProviderNetwork
+      network_technology:
+        type: string
+        description: ECOMP supported network technology
+        default: NEUTRON
+      network_homing:
+        type: org.openecomp.datatypes.EcompHoming
+    capabilities:
+      virtual_linkable:
+        type: tosca.capabilities.network.Linkable
+        occurrences:
+        - 1
+        - UNBOUNDED
\ No newline at end of file

diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip
new file mode 100644 (file)
index 0000000..ed51f83
Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip differ

diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json
new file mode 100644 (file)
index 0000000..22788ec
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.json
@@ -0,0 +1,15 @@
+{
+       "payloadName": "NSD.yml",
+       "contactId": "jh0003",
+       "name": "NSD",
+       "description": "NSD",
+       "resourceIconPath": "network",
+       "resourceType": "VFC",
+       "categories": [{
+               "name": "Generic",
+               "subcategories": [{
+                       "name": "Network Elements"
+               }]
+       }],
+       "tags": ["NSD"]
+}
\ No newline at end of file

diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml
new file mode 100644 (file)
index 0000000..1b3d882
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.yml
@@ -0,0 +1,41 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+  org.openecomp.resource.vfc.NSD:
+    derived_from: tosca.nodes.Root
+    description: ECOMP Allotted Resource base type all other allotted resources node types derive from
+    properties:
+      nsd_id:
+        type: string
+        required: true
+        description: ID of the NSD
+      nsd_designer:
+        type: string
+        required: true
+        description: Designer of the NSD
+      nsd_version:
+        type: string
+        required: true
+        description: Version of the NSD
+      nsd_name:
+        type: string
+        required: true
+        description: Name of the NSD
+      providing_service_uuid:
+        type: string
+        required: true
+        description: The depending service uuid in order to map the allotted resource to the specific service version
+      providing_service_invariant_uuid:
+        type: string
+        required: true
+        description: The depending service invariant uuid in order to map the allotted resource to the specific service version
+      providing_service_name:
+        type: string
+        required: true
+        description: The depending service name in order to map the allotted resource to the specific service version
+    requirements:
+    - virtualLink:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+    capabilities:
+      virtual_linkable:
+        type: tosca.capabilities.network.Linkable

diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.zip b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.zip
new file mode 100644 (file)
index 0000000..d741b50
Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/onap-types/NSD/NSD.zip differ

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
index 78b257d..c72c2c3 100644 (file)
--- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
@@ -53,7 +53,8 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion):
                                  "multiFlavorVFC",
                                  "vnfConfiguration",
                                  "underlayVpn",
-                                 "overlayTunnel"
+                                 "overlayTunnel",
+                                 "genericNeutronNet"
                                  ]
                
        responseCodes = [200, 201]

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py
index f91b64e..31c11c7 100644 (file)
--- a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py
@@ -29,7 +29,8 @@ def importOnapTypes(beHost, bePort, adminUser, fileDir, updateversion):
                      "vduCompute",
                                  "vduCpd",
                                  "vduVirtualStorage",
-                                 "vnfVirtualLinkDesc"
+                                 "vnfVirtualLinkDesc",
+                                 "NSD"
                                  ]
                
        responseCodes = [200, 201]

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json
index a6948f5..c518855 100644 (file)
--- a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json
+++ b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json
@@ -1,13 +1,54 @@
 {
   "heat": [
-    "contrailPort",
-    "extCp",
-    "contrailV2VirtualMachineInterface",
+    "globalNetwork",
+    "globalPort",
+    "globalCompute",
+    "volume",
+    "cinderVolume",
+    "contrailVirtualNetwork",
+    "neutronNet",
     "neutronPort",
+    "novaServer",
+    "extVl",
+    "internalVl",
+    "extCp",
+    "vl",
+    "eline",
+    "abstractSubstitute",
+    "Generic_VFC", 
+    "Generic_VF",
     "Generic_PNF",
+    "Generic_Service",
+    "contrailNetworkRules",
+    "contrailPort",
+    "contrailV2NetworkRules",
+    "contrailV2VirtualNetwork",
+    "securityRules",
+    "contrailAbstractSubstitute",
+    "contrailCompute",
+    "contrailV2VirtualMachineInterface",
+    "subInterface",
+    "contrailV2VLANSubInterface",
     "multiFlavorVFC",
-       "vnfConfiguration"
+    "vnfConfiguration",
+    "underlayVpn",
+    "overlayTunnel",
+    "genericNeutronNet"
   ],
   "normative": [
+    "root", 
+    "compute",
+    "softwareComponent",
+    "webServer",
+    "webApplication",
+    "DBMS",
+    "database",
+    "objectStorage",
+    "blockStorage",
+    "containerRuntime",
+    "containerApplication",
+    "loadBalancer",
+    "port",
+    "network"
   ]
 }
\ No newline at end of file