From: Tal Gitelman <tg851x@intl.att.com>
Date: Wed, 29 Aug 2018 12:35:05 +0000 (+0300)
Subject: Fix CSIT on sdc-master
X-Git-Tag: 1.3.0~135
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8eff5a1ff79ca212a42d0e69326af7dc00b7c503;p=sdc.git

Fix CSIT on sdc-master

Change-Id: I22514076a37e82d0ea8b6d202918a6e519618755
Issue-ID: SDC-1689
Signed-off-by: Tal Gitelman <tg851x@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 e62c8e8f7d..169ecb0552 100644
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
@@ -958,6 +958,17 @@ org.openecomp.datatypes.network.NetworkAssignments:
       type: org.openecomp.datatypes.network.IPv6SubnetAssignments
       required: true
       description: IPv6 defualt subnet assignments
+    related_networks:
+      type: list
+      required: false
+      description: Related Networks List.
+      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
@@ -970,7 +981,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)
@@ -1272,6 +1283,15 @@ org.openecomp.datatypes.ImageInfo:
         type: string
         required: false
         default: md5
+
+org.openecomp.datatypes.network.RelatedNetworksAssignments:
+  derived_from: org.openecomp.datatypes.Root
+  properties:
+      related_network_role:
+        type: string
+        description: The network role of the related network, sharing provider network.
+        required: false
+  
 #ONAP types 
 tosca.datatypes.nfv.VnfcConfigurableProperties:
   derived_from: tosca.datatypes.Root
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 c0fd672ee9..8304e3f260 100644
--- 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,13 @@ 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