Network Cloud onboarding model sync with sdc model

Change-Id: Id3ab68276b25ad06c22b34412cf841e4209a17f6
Issue-ID: SDC-1621
Signed-off-by: Assaf, Shay (sa726r) <sa726r@intl.att.com>

diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
index b3635dc..d4c6bf1 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
@@ -930,6 +930,14 @@ org.openecomp.datatypes.network.IPv6SubnetAssignments:
       required: true
       description: Indicates IPv6 subnet assignments
 
+org.openecomp.datatypes.network.RelatedNetworksAssignments:
+  derived_from: org.openecomp.datatypes.Root
+  properties:
+    related_network_role:
+      description: The network role of the related network, sharing provider network
+      type: string
+      required: false
+
 org.openecomp.datatypes.network.NetworkAssignments:
   derived_from: org.openecomp.datatypes.Root
   properties:
@@ -970,7 +978,7 @@ org.openecomp.datatypes.network.ProviderNetwork:
       type: string
       required: false
       constraints:
-        - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22"]
+        - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22", "sriovnet1", "sriovnet2", "oam"]
       description: >
         Identifies the NUMA processor cluster to which this physical network interface belongs.
         NUMA instance correlates to the first digit of the Physical Network Name suffix (e.g. \"01\" = NUMA 0, \"11\" = NUMA 1)

diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml
index c0fd672..a21e151 100644 (file)
--- a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml
@@ -40,6 +40,12 @@ node_types:
         type: boolean
         required: false
         default: false
+      related_networks:
+        type: list
+        description: Related Networks List.
+        required: false
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     capabilities:
       network.incoming.packets.rate:
         type: org.openecomp.capabilities.metric.Ceilometer

diff --git a/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml b/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
index 335758e..7f6c80c 100644 (file)
--- a/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
+++ b/catalog-be/src/test/resources/yamlValidation/test-no-valid.yml
@@ -940,6 +940,17 @@ org.openecomp.datatypes.network.NetworkAssignments:
       type: org.openecomp.datatypes.network.IPv6SubnetAssignments
       required: true
       description: IPv6 defualt subnet assignments
+    related_networks:
+      type: list
+      description: Related Networks List.
+      required: false
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    is_trunked:
+      type: boolean
+      required: true
+      description: \"true\" indicates that network is trunked
+      default: false
 
 org.openecomp.datatypes.network.ProviderNetwork:
   derived_from: org.openecomp.datatypes.Root
@@ -952,7 +963,7 @@ org.openecomp.datatypes.network.ProviderNetwork:
       type: string
       required: false
       constraints:
-        - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22"]
+        - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22", "sriovnet1", "sriovnet2", "oam"]
       description: >
         Identifies the NUMA processor cluster to which this physical network interface belongs.
         NUMA instance correlates to the first digit of the Physical Network Name suffix (e.g. \"01\" = NUMA 0, \"11\" = NUMA 1)

diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
index ef11987..a47e65f 100644 (file)
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml
@@ -28,7 +28,7 @@ data_types:
     derived_from: org.openecomp.datatypes.Root
     properties:
       is_provider_network:
-        description: \"true\" indicates that this a Neutron provider type of network
+        description: \"true\" testShouldLocatePathWhenResourcePresentInUrlsindicates that this a Neutron provider type of network
         type: boolean
         required: true
       physical_network_name:
@@ -44,6 +44,9 @@ data_types:
           - Physnet44
           - Physnet21
           - Physnet22
+          - sriovnet1
+          - sriovnet2
+          - oam
       numa:
         description: |
           PNIC instance within the NUMA processor cluster PNIC Instance correlates to the second digit of the Physical Network Name suffix (e.g. "01" = PNIC 1, "02" = "PNIC 2)
@@ -446,6 +449,25 @@ data_types:
         description: Reference to VLAN or other address plan ID used to assign subnets to this network
         type: string
         required: true
+      related_networks:
+        type: list
+        description: Related Networks List.
+        required: false
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      is_trunked:
+        type: boolean
+        required: true
+        description: \"true\" indicates that network is trunked
+        default: false
+
+  org.openecomp.datatypes.network.RelatedNetworksAssignments:
+    derived_from: org.openecomp.datatypes.Root
+    properties:
+      related_network_role:
+        description: The network role of the related network, sharing provider network
+        type: string
+        required: false
 
   org.openecomp.datatypes.network.IPv6SubnetAssignments:
     derived_from: org.openecomp.datatypes.network.SubnetAssignments

diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
index 53e89b1..b788c1f 100644 (file)
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml
@@ -88,7 +88,6 @@ node_types:
         type: org.openecomp.datatypes.network.NetworkFlows
         required: false
 
-
   org.openecomp.resource.vfc.nodes.Compute:
     derived_from: tosca.nodes.Compute
     capabilities:
@@ -489,6 +488,12 @@ node_types:
         description: subnet pool id
         type: string
         required: false
+      related_networks:
+        type: list
+        description: Related Networks List.
+        required: false
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     capabilities:
       network.incoming.packets.rate:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.

diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml
index bc869cc..2f2249f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/data.yml
@@ -28,6 +28,9 @@ data_types:
           - Physnet44
           - Physnet21
           - Physnet22
+          - sriovnet1
+          - sriovnet2
+          - oam
       numa:
         type: string
         description: |
@@ -424,6 +427,24 @@ data_types:
         description: Reference to VLAN or other address plan ID used to assign subnets to this network
         required: true
         status: SUPPORTED
+      related_networks:
+        type: list
+        description: Related Networks List.
+        required: false
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      is_trunked:
+        type: boolean
+        required: true
+        description: \"true\" indicates that network is trunked
+        default: false
+  org.openecomp.datatypes.network.RelatedNetworksAssignments:
+    derived_from: org.openecomp.datatypes.Root
+    properties:
+      related_network_role:
+        description: The network role of the related network, sharing provider network
+        type: string
+        required: false
   org.openecomp.datatypes.network.IPv6SubnetAssignments:
     derived_from: org.openecomp.datatypes.network.SubnetAssignments
     properties:

diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
index b8f946f..dad7feb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/toscaGlobalServiceTemplates/openecomp/nodes.yml
@@ -486,6 +486,12 @@ node_types:
         description: subnet pool id
         type: string
         required: false
+      related_networks:
+        type: list
+        description: Related Networks List.
+        required: false
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     capabilities:
       network.incoming.packets.rate:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.