related-networks property support as input

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

diff --git a/build.gradle b/build.gradle
index 5f290f2..d15a3ca 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,27 @@
-import javax.imageio.ImageIO
-import javax.swing.*
-import java.awt.*
-import java.awt.event.ActionEvent
-import java.awt.event.ActionListener
-import java.util.List
 import java.util.concurrent.Callable
 import java.util.concurrent.Executors
 import java.util.concurrent.atomic.AtomicBoolean
+import java.awt.AWTException
+import java.awt.Font
+import java.awt.Image
+import java.awt.Menu
+import java.awt.MenuItem
+import java.awt.PopupMenu
+import java.awt.SystemTray
+import java.awt.TrayIcon
+import java.awt.event.ActionEvent
+import java.awt.event.ActionListener
+import javax.swing.JOptionPane
+import javax.imageio.ImageIO
 
-import static ServiceControl.*
 import static Services.*
+import static ServiceControl.*
+/*
+* open CMD  -> gradle health
+*
+* */
 
-group 'com.att.ecomp'
+group 'org.onap.sdc'
 version '1.01-SNAPSHOT'
 
 apply plugin: 'groovy'
@@ -48,35 +58,39 @@ enum ServiceControl {
     STOP ,
     KILL
 }
+enum Environment {
+    OLD_VAGRANT , PROD_VAGRANT , ONAP_VAGRANT
+}
 //env variables
 //fill YOUR_WINDOWS_USER_HOME
-project.ext.set("NEW_VAG",Boolean.FALSE) //flags to use new vagrant configuration
+project.ext.set("VM_TYPE", Environment.ONAP_VAGRANT) //flags to use new vagrant configuration
+//project.ext.set("NEW_VAG",Boolean.FALSE) //flags to use new vagrant configuration
 project.ext.set("IS_HOTSWAP",Boolean.FALSE) //flags to use new vagrant configuration
 project.ext.set("PROJECT_PATH", System.getenv("SDC")) //ex. 'C:\\GIT_WORK\\asdc\\sdc')
-project.ext.set("VAGRANT_HOME", NEW_VAG ? System.getenv("NEW_VAG") : System.getenv("VAG")) //ex. 'C:\\GIT_WORK\\vagrant-asdc-all-in-one')
+project.ext.set("VAGRANT_HOME", isProductionVM() ? System.getenv("NEW_VAG") : isOnapVM() ? System.getenv("ONAP_VAG") :System.getenv("VAG")) //ex. 'C:\\GIT_WORK\\vagrant-asdc-all-in-one')
 project.ext.set("USER_HOME", "${System.getenv("USERPROFILE")}\\.ssh")
-project.ext.set("BE_REMOTE", NEW_VAG ? '/opt/app/jetty/base/be' : '/home/vagrant/catalog-be' )
-project.ext.set("FE_REMOTE", NEW_VAG ? '/opt/app/jetty/base/fe' : '/home/vagrant/catalog-fe' )
-project.ext.set("VAGRANT_USER",     NEW_VAG ? 'm11981' : 'vagrant' )
-project.ext.set("RSA_PRIVATE_KEY_PATH", NEW_VAG ? "$VAGRANT_HOME/id_rsa" : '' )
-project.ext.set("VAGRANT_PASSWORD", NEW_VAG ? 'Aa123456' : 'vagrant' )
+project.ext.set("BE_REMOTE", isProductionVM() ? '/opt/app/jetty/base/be' : '/home/vagrant/catalog-be' )
+project.ext.set("FE_REMOTE", isProductionVM() ? '/opt/app/jetty/base/fe' : '/home/vagrant/catalog-fe' )
+project.ext.set("VAGRANT_USER",     isProductionVM() ? 'm11981' : 'vagrant' )
+project.ext.set("RSA_PRIVATE_KEY_PATH", isProductionVM() ? "$VAGRANT_HOME/id_rsa" : '' )
+project.ext.set("VAGRANT_PASSWORD", isProductionVM() ? 'Aa123456' : 'vagrant' )
 project.ext.set("X_FOLDER",'/xFolder' )
 project.ext.set("BE_DEPENDENCIES", 'common-be,common-app-api,catalog-dao,catalog-model,security-utils' )
-project.ext.set("command", [ (ALL) :  [  (HEALTH) : { NEW_VAG ? 'sudo curl -i http://localhost:8181/sdc1/rest/healthCheck' : 'curl -i localhost:8080/sdc2/rest/healthCheck' } ,
-                                         (KILL) : { NEW_VAG ? 'sudo pkill java' : 'pkill java'} ]  ,   //  TODO: refine kill only for services
-                             (BACKEND) : [  (START) : { NEW_VAG ? 'sudo service jettyBE start' : 'service catalog-be start'} ,
-                                            (STOP) : { NEW_VAG ? 'sudo service jettyBE stop' : 'service catalog-be stop'} ,
-                                            (RESTART) : { NEW_VAG ? 'sudo service jettyBE restart' : 'service catalog-be restart'}]  ,
-                             (DB) : [  (START) : { NEW_VAG ? 'sudo service cassandra start' : 'start-asdc-storage.sh' } ,
-                                       (STOP) : { NEW_VAG ? 'sudo service cassandra stop' : 'service cassandra stop'} ,
-                                       (RESTART) : { NEW_VAG ? 'sudo service cassandra restart' : 'service cassandra restart'} ]  ,
-                             (FRONTEND): [  (START) : {  NEW_VAG ? 'sudo service jettyFE start' : 'service catalog-fe start'   } ,
-                                            (STOP) : { NEW_VAG ? 'sudo service jettyFE stop' : 'service catalog-fe stop'} ,
-                                            (RESTART) : {  NEW_VAG ? 'sudo service jettyFE restart' : 'service catalog-fe restart'   } ]  ,
-                             (CACHING): [  (START) : { NEW_VAG ? 'sudo service elasticsearch start' : 'echo "starting es is not yet supported"'   } ],
-                             (SECURITY): [  (START) : {  NEW_VAG ? 'sudo docker start sdc-WebSeal-Simulator' : 'service webseal-simulator start'   } ,
-                                            (STOP) : { NEW_VAG ? 'sudo docker stop sdc-WebSeal-Simulator' : 'service webseal-simulator stop'} ,
-                                            (RESTART) : { NEW_VAG ? 'sudo docker restart sdc-WebSeal-Simulator' : 'service webseal-simulator restart'}]
+project.ext.set("command", [ (ALL) :  [  (HEALTH) : { isProductionVM() ? 'sudo curl -i http://localhost:8181/sdc1/rest/healthCheck' : isOnapVM() ? 'sudo -i /data/scripts/docker_health.sh' : 'curl -i localhost:8080/sdc2/rest/healthCheck' } ,
+                                         (KILL) : { isProductionVM() ? 'sudo pkill java' : isOnapVM() ? 'sudo -i docker kill $(docker ps -q)' : 'pkill java'} ]  ,   //  TODO: refine kill only for services
+                             (BACKEND) : [  (START) : { isProductionVM() ? 'sudo service jettyBE start' : isOnapVM() ? 'sudo -i docker start sdc-BE' : 'service catalog-be start'} ,
+                                            (STOP) : { isProductionVM() ? 'sudo service jettyBE stop' : isOnapVM() ? 'sudo -i docker stop sdc-BE' : 'service catalog-be stop'} ,
+                                            (RESTART) : { isProductionVM() ? 'sudo service jettyBE restart' : isOnapVM() ? 'sudo -i docker restart sdc-BE' : 'service catalog-be restart'}]  ,
+                             (DB) : [  (START) : { isProductionVM() ? 'sudo service cassandra start' :  isOnapVM() ? 'sudo -i docker start sdc-cs' : 'start-asdc-storage.sh' } ,
+                                       (STOP) : { isProductionVM() ? 'sudo service cassandra stop' : isOnapVM() ? 'sudo -i docker stop sdc-cs' : 'service cassandra stop'} ,
+                                       (RESTART) : { isProductionVM() ? 'sudo service cassandra restart' : isOnapVM() ? 'sudo -i docker restart sdc-cs' : 'service cassandra restart'} ]  ,
+                             (FRONTEND): [  (START) : {  isProductionVM() ? 'sudo service jettyFE start' : isOnapVM() ? 'sudo -i docker start sdc-FE' : 'service catalog-fe start'   } ,
+                                            (STOP) : { isProductionVM() ? 'sudo service jettyFE stop' : isOnapVM() ? 'sudo -i docker stop sdc-FE' : 'service catalog-fe stop'} ,
+                                            (RESTART) : {  isProductionVM() ? 'sudo service jettyFE restart' : isOnapVM() ? 'sudo -i docker restart sdc-FE' : 'service catalog-fe restart'   } ]  ,
+                             (CACHING): [  (START) : { isProductionVM() ? 'sudo service elasticsearch start' : isOnapVM() ? 'sudo -i docker start sdc-es' : 'echo "starting es is not yet supported"'   } ],
+                             (SECURITY): [  (START) : {  isProductionVM() ? 'sudo docker start sdc-WebSeal-Simulator' : isOnapVM() ? 'sudo -i /data/scripts/simulator_docker_run.sh -r $(echo $(sudo -i docker images onap/sdc-simulator | grep onap/sdc-simulator | head -1 |  awk \'{print $2}\'))' :  'service webseal-simulator start'   } ,
+                                            (STOP) : { isProductionVM() ? 'sudo docker stop sdc-WebSeal-Simulator' : isOnapVM() ? 'sudo -i docker stop sdc-sim' : 'service webseal-simulator stop'} ,
+                                            (RESTART) : { isProductionVM() ? 'sudo docker restart sdc-WebSeal-Simulator' : isOnapVM() ? 'sudo -i docker restart sdc-sim' : 'service webseal-simulator restart'}]
                              ] )      //abstraction level to shell scripts , support old and new vagrant bash commands
 
 //icons
@@ -108,31 +122,6 @@ project.ext.set("toggleHealthItemView" , null )
 project.ext.set("IS_MVN_INSTALL",false)
 project.ext.set("executor" , null )
 project.ext.set("lockObj" , new Object() )
-/*compile?.doLast {
-    println "2. hello compile2"
-}*/
-
-/*def post(String host , String serviceName,String msg){
-    // POST
-    def post = new URL("$host/$serviceName").openConnection();
-    def message = '{"message":"this is a message"}'
-    post.setRequestMethod("POST")
-    post.setDoOutput(true)
-    post.setRequestProperty("Content-Type", "application/json")
-    post.getOutputStream().write(message.getBytes("UTF-8"));
-    def postRC = post.getResponseCode();
-    println(postRC);
-    if( postRC.equals(200)) {
-        println(post.getInputStream().getText());
-    }
-}
-
-def postStat( long operationTime, String user , String meta  ){
-    def host = 'http://135.76.123.70:8888'
-    def params = "user=$user&meta=$meta"
-    post host , "UserStats" , params
-}*/
-
 
 def hash( List list ){
     def map = list?.collectEntries { File file -> [(file?.absolutePath) : file?.text?.hashCode() ]}
@@ -154,7 +143,7 @@ def pomChanges(){
     changes?.each { pomChangesMap[it] = new File(it)?.text?.hashCode() }
     println "\n\n[MasterD][POM]--> pom map -> $pomChangesMap"
 
-    println """ 
+    println """
             ****** POM changes detection finished after -> ${System.currentTimeMillis()- started}ms  ******
             """
 
@@ -285,11 +274,19 @@ remotes {
         port = 2222
         user = VAGRANT_USER
         password = VAGRANT_PASSWORD
-        identity = NEW_VAG ? new File(RSA_PRIVATE_KEY_PATH) : null
+        identity = isProductionVM() ? new File(RSA_PRIVATE_KEY_PATH) : null
     }
 
 }
 
+def isProductionVM(){
+  return VM_TYPE?.equals(Environment.PROD_VAGRANT)
+}
+
+def isOnapVM(){
+    return VM_TYPE?.equals(Environment.ONAP_VAGRANT)
+}
+
 def gitLatest(){
 
 }
@@ -336,7 +333,7 @@ def cleanTitan(){
         }
         ssh.run {
             session(remotes.vagrant) {
-                execute "cqlsh -e 'DROP KEYSPACE titan;'"
+                execute "sudo cqlsh -e 'DROP KEYSPACE titan;'"
                 println "[MasterD][DB_DROP]-> Dropped 'titan' KEYSPACE."
             }
         }
@@ -470,6 +467,8 @@ def copyFE() {
             println "[MasterD][FrontEnd] copying ${file.length()/(1024*1024)} MB, from ${file?.name} to $FE_REMOTE/webapps"
             ssh.run {
                 session(remotes.vagrant) {
+                    if ( isProductionVM() )
+                        execute 'sudo chmod -R 777 /opt/app/jetty/base/fe/webapps'
                     put from: file?.absolutePath , into: "$FE_REMOTE/webapps"
                 }
             }
@@ -499,6 +498,8 @@ def copyBE(){
             println "[MasterD][BackEnd] copying ${file.length()/(1024*1024)} MB, from ${file?.name} to $BE_REMOTE/webapps"
             ssh.run {
                 session(remotes.vagrant) {
+                    if (isProductionVM())
+                        execute 'sudo chmod -R 777 /opt/app/jetty/base/be/webapps'
                     put from: file?.absolutePath , into: "$BE_REMOTE/webapps"
                 }
             }
@@ -794,7 +795,7 @@ def restartBackend(){
         }
         ssh.run {
             session(remotes.vagrant) {
-                println msg("[MasterD] restarting backend sever")
+                println msg("[MasterD] restarting backend server")
 
                 execute command[BACKEND][RESTART]()
             }
@@ -803,6 +804,51 @@ def restartBackend(){
     println """[MasterD]->  finished !!
                                            """
 }
+
+def startSecurity(){
+    println "[MasterD] starting security&simulator engine"
+    execSafe {
+        ssh.settings {
+            knownHosts = allowAnyHosts
+        }
+        ssh.run {
+            session(remotes.vagrant) {
+                execute command[SECURITY][START]()
+            }
+        }
+    }
+    println """[MasterD]->  finished !!
+                                           """
+}
+task startSecurity(){
+    doLast {
+        startSecurity()
+    }
+}
+
+def stopSecurity(){
+    println "[MasterD] stopping security&simulator engine"
+    execSafe {
+        ssh.settings {
+            knownHosts = allowAnyHosts
+        }
+        ssh.run {
+            session(remotes.vagrant) {
+                execute command[SECURITY][STOP]()
+            }
+        }
+    }
+    println """[MasterD]->  finished !!
+                                           """
+}
+
+task stopSecurity(){
+    doLast {
+        stopSecurity()
+    }
+}
+
+
 //todo- remove this if you want to auto-deploy on every file save
 /*
 compileJava.doFirst{
@@ -874,7 +920,7 @@ def importNormative(){
                                                                                        importNormative
                                                                *-*-************************************-*-*
                                                        """
-                execute "python -v $BE_REMOTE/scripts/import/tosca/importNormativeAll.py"
+                execute "sudo python -v $BE_REMOTE/scripts/import/tosca/importNormativeAll.py"
             }
         }
     }
@@ -883,17 +929,17 @@ def importNormative(){
 def startAll(){
     def startCassandra = """
                         #!/bin/bash
-                        
+
                         cassandra&
                         elasticsearch -d
-                        
+
                         #Wait until ES is up
                         until curl localhost:9200/_cluster/health;
                         do
                             printf "."
                             sleep 3
                         done
-                        
+
                         # Create Elastic Mapping if not exist in ES
                         createESMapping.sh
                         """
@@ -904,7 +950,7 @@ def startAll(){
                                                                starting all SDC services(DB,BE,FE,Webseal)
                                                        *-*-************************************-*-*
                                """
-                if ( NEW_VAG ){
+                if ( isProductionVM() ){
                     execute command[DB][START]()
                     Thread.sleep(5000)
                     execute command[CACHING][START]()
@@ -1098,11 +1144,13 @@ ext.updateTray = { STATUS status ->
         Menu backendMenu = new Menu("Backend");
         Menu frontendMenu = new Menu("Frontend");
         Menu dbMenu = new Menu("Database");
+        Menu securityMenu = new Menu("Security");
         try{
             deployMasterMenu.setFont(new Font("Cooper Black" ,Font.BOLD ,14f ))
             backendMenu.setFont(new Font("Cooper Black" ,Font.PLAIN ,13f ))
             frontendMenu.setFont(new Font("Cooper Black" ,Font.PLAIN ,13f ))
             dbMenu.setFont(new Font("Cooper Black" ,Font.PLAIN ,13f ))
+            securityMenu.setFont(new Font("Cooper Black" ,Font.PLAIN ,13f ))
         }catch(Exception e){
             println e
         }
@@ -1129,7 +1177,7 @@ ext.updateTray = { STATUS status ->
         MenuItem copyBeWarItem = new MenuItem("[BE] Copy War");
         backendMenu.add(startItem);
         backendMenu.add(stopItem);
-        backendMenu.add(copyBeWarItem);
+        (isOnapVM()) ?: backendMenu.add(copyBeWarItem);
 
         //FE menu
         MenuItem startFEItem = new MenuItem("[FE] Start");
@@ -1137,7 +1185,7 @@ ext.updateTray = { STATUS status ->
         MenuItem copyFeWarItem = new MenuItem("[FE] Copy War");
         frontendMenu.add(startFEItem);
         frontendMenu.add(stopFEItem);
-        frontendMenu.add(copyFeWarItem);
+        (isOnapVM()) ?: frontendMenu.add(copyFeWarItem);
 
         //DB menu
         MenuItem startDBItem = new MenuItem("[DB] Start");
@@ -1149,7 +1197,11 @@ ext.updateTray = { STATUS status ->
         dbMenu.add(backupDBItem);
         dbMenu.add(restoreDBItem);
         //endregion
-
+        //Security Menu
+        MenuItem startSecurityItem = new MenuItem("[Security] Start");
+        MenuItem stopSecurityItem = new MenuItem("[Security] Stop");
+        securityMenu.add(startSecurityItem)
+        securityMenu.add(stopSecurityItem)
 
         MenuItem killItem = new MenuItem("Kill All");
         MenuItem startAllItem = new MenuItem("Start All");
@@ -1161,22 +1213,24 @@ ext.updateTray = { STATUS status ->
 
         toggleHealthItemView = toggleHealthItem;
 
-        popup.add(hotswapItem);
-        popup?.addSeparator();
-        popup.add(deployMasterMenu);
-        popup?.addSeparator();
+        (isOnapVM()) ?: popup.add(hotswapItem);
+        (isOnapVM()) ?:popup?.addSeparator();
+        (isOnapVM()) ?: popup.add(deployMasterMenu);
+        (isOnapVM()) ?:popup?.addSeparator();
         popup.add(backendMenu)
         popup.add(frontendMenu)
-        popup.add(dbMenu)
+        (isOnapVM()) ?: popup.add(dbMenu)
+        popup?.addSeparator();
+        popup?.add(securityMenu)
         popup?.addSeparator();
         popup.add(startAllItem);
         popup.add(killItem);
         popup?.addSeparator();
         popup.add(toggleHealthItem);
         popup.add(healthInfoItem);
-        popup?.addSeparator();
-        popup.add(importItem);
-        popup.add(logsItem);
+        (isOnapVM()) ?:popup?.addSeparator();
+        (isOnapVM()) ?: popup.add(importItem);
+        (isOnapVM()) ?: popup.add(logsItem);
         popup?.addSeparator();
         popup.add(exitItem);
         //endregion UI
@@ -1202,6 +1256,9 @@ ext.updateTray = { STATUS status ->
 
         ActionListener startAllListener = newListener { parallel { startAll() } }
 
+        ActionListener startSecurityListener = newListener { startSecurity() }
+        ActionListener stopSecurityListener = newListener { stopSecurity() }
+
         ActionListener listener5 = new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 try {
@@ -1329,6 +1386,8 @@ ext.updateTray = { STATUS status ->
         stopItem.addActionListener(stopBackendListener)
         startItem.addActionListener(startBEListener)
         copyBeWarItem.addActionListener(copyBeWarListener);
+        startSecurityItem.addActionListener(startSecurityListener)
+        stopSecurityItem.addActionListener(stopSecurityListener)
         killItem.addActionListener(killJavaListener)
         startAllItem.addActionListener(startAllListener)
         importItem.addActionListener(listener5)

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 2462302..e62c8e8 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
@@ -958,17 +958,6 @@ 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
@@ -981,7 +970,7 @@ org.openecomp.datatypes.network.ProviderNetwork:
       type: string
       required: false
       constraints:
-        - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22", "sriovnet1", "sriovnet2", "oam"]
+        - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22"]
       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)
@@ -1283,15 +1272,6 @@ 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 a21e151..c0fd672 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,12 +40,6 @@ 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 7f6c80c..335758e 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,17 +940,6 @@ 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
@@ -963,7 +952,7 @@ org.openecomp.datatypes.network.ProviderNetwork:
       type: string
       required: false
       constraints:
-        - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22", "sriovnet1", "sriovnet2", "oam"]
+        - valid_values: ["Physnet41", "Physnet42", "Physnet43", "Physnet44", "Physnet21", "Physnet22"]
       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 a47e65f..b87cbb7 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\" testShouldLocatePathWhenResourcePresentInUrlsindicates that this a Neutron provider type of network
+        description: \"true\" indicates that this a Neutron provider type of network
         type: boolean
         required: true
       physical_network_name:

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml
index 46457ea..c68eaee 100644 (file)
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/resources/extractServiceComposition/toscaGlobalServiceTemplates/openecomp/data.yml
@@ -44,6 +44,10 @@ 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)
@@ -412,6 +416,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/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-mandatory-unifiedModel.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-mandatory-unifiedModel.json
index 2b8f484..81a9089 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-mandatory-unifiedModel.json
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/resources/config-mandatory-unifiedModel.json
@@ -34,7 +34,8 @@
       "network_role",
       "order",
       "exCP_naming",
-      "subnetpoolid"
+      "subnetpoolid",
+      "related_networks"
     ]
   ,
   "_config": {

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1a003c8..c2bde7b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.plt:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_plt_data_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_plt_oam_0_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -124,6 +130,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_plt_oam_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_plt_internal_0_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -168,6 +180,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_plt_internal_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_plt_oam_0_port_order:
         type: integer
         required: true
@@ -879,6 +897,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_app_internal_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_app_oam_0_port_network_role:
         type: string
         required: true
@@ -889,6 +913,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_app_data_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_app_data_0_port_ip_requirements:
         type: list
         required: true
@@ -909,6 +939,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
+      port_app_oam_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_app_data_0_port_subnetpoolid:
         type: string
         required: true
@@ -1574,6 +1610,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_iox_data_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -1674,6 +1716,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_iox_oam_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_iox_internal_0_port_security_groups:
         type: list
         required: true
@@ -1774,6 +1822,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_iox_internal_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_iox_oam_0_port_allowed_address_pairs:
         type: list
         required: true
@@ -2323,4 +2377,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
index 9f19dcc..081b35a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
@@ -88,6 +88,11 @@ topology_template:
     port_app_internal_0_port_network_role_tag:
       type: string
       required: true
+    port_app_internal_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_app_oam_0_port_network_role:
       type: string
       required: true
@@ -96,6 +101,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_app_data_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_app_data_0_port_ip_requirements:
       type: list
       required: true
@@ -112,6 +122,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.network.AddressPair
+    port_app_oam_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_app_data_0_port_subnetpoolid:
       type: string
       required: true
@@ -276,6 +291,8 @@ topology_template:
         vlan_requirements:
           get_input: port_app_internal_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_app_internal_0_port_related_networks
         ip_requirements:
           get_input: port_app_internal_0_port_ip_requirements
         network_role_tag:
@@ -317,6 +334,8 @@ topology_template:
         vlan_requirements:
           get_input: port_app_oam_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_app_oam_0_port_related_networks
         ip_requirements:
           get_input: port_app_oam_0_port_ip_requirements
         network_role_tag:
@@ -362,6 +381,8 @@ topology_template:
         vlan_requirements:
           get_input: port_app_data_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_app_data_0_port_related_networks
         ip_requirements:
           get_input: port_app_data_0_port_ip_requirements
         network_role_tag:
@@ -645,4 +666,4 @@ topology_template:
       - link
       dependency_app_app_data_0_port:
       - app_app_data_0_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
index 5776405..49e8ee1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_iox_data_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -110,6 +115,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_iox_oam_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_iox_internal_0_port_security_groups:
       type: list
       required: true
@@ -191,6 +201,11 @@ topology_template:
     port_iox_internal_0_port_network_role_tag:
       type: string
       required: true
+    port_iox_internal_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_iox_oam_0_port_allowed_address_pairs:
       type: list
       required: true
@@ -246,6 +261,8 @@ topology_template:
         vlan_requirements:
           get_input: port_iox_data_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_iox_data_0_port_related_networks
         ip_requirements:
           get_input: port_iox_data_0_port_ip_requirements
         network_role_tag:
@@ -324,6 +341,8 @@ topology_template:
         vlan_requirements:
           get_input: port_iox_oam_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_iox_oam_0_port_related_networks
         ip_requirements:
           get_input: port_iox_oam_0_port_ip_requirements
         network_role_tag:
@@ -371,6 +390,8 @@ topology_template:
         vlan_requirements:
           get_input: port_iox_internal_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_iox_internal_0_port_related_networks
         ip_requirements:
           get_input: port_iox_internal_0_port_ip_requirements
         network_role_tag:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
index 43be472..bc794e7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_plt_data_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_plt_oam_0_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -105,6 +110,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_plt_oam_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_plt_internal_0_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -140,6 +150,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_plt_internal_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_plt_oam_0_port_order:
       type: integer
       required: true
@@ -246,6 +261,8 @@ topology_template:
         vlan_requirements:
           get_input: port_plt_internal_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_plt_internal_0_port_related_networks
         ip_requirements:
           get_input: port_plt_internal_0_port_ip_requirements
         network_role_tag:
@@ -289,6 +306,8 @@ topology_template:
         vlan_requirements:
           get_input: port_plt_data_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_plt_data_0_port_related_networks
         ip_requirements:
           get_input: port_plt_data_0_port_ip_requirements
         network_role_tag:
@@ -367,6 +386,8 @@ topology_template:
         vlan_requirements:
           get_input: port_plt_oam_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_plt_oam_0_port_related_networks
         ip_requirements:
           get_input: port_plt_oam_0_port_ip_requirements
         network_role_tag:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cde571c..6c0bcc4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -425,4 +431,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml
index 9ce1d48..2d01270 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cde571c..6c0bcc4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -425,4 +431,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
index 9ce1d48..2d01270 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cde571c..6c0bcc4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -425,4 +431,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml
index 9ce1d48..2d01270 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d155532..1e5c153 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -50,6 +50,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -443,4 +449,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml
index ea4971f..81bfd43 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml
@@ -46,6 +46,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -127,6 +132,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -322,4 +329,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 75b3040..f412838 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -64,6 +64,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_vce_SRIOV2_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vce_oam0_port_network:
         type: list
         required: true
@@ -78,6 +84,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_vce_oam0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vce_SRIOV1_0_port_order:
         type: integer
         required: true
@@ -108,6 +120,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_vce_SRIOV1_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_vce_availability_zone:
         type: list
         required: true
@@ -750,4 +768,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/Nested_vceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/Nested_vceServiceTemplate.yaml
index e757ac4..764a892 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/Nested_vceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/localNode/novaServerWithFabricConfigurationCapability/out/Nested_vceServiceTemplate.yaml
@@ -62,6 +62,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_vce_SRIOV2_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vce_oam0_port_network:
       type: list
       required: true
@@ -73,6 +78,11 @@ topology_template:
     port_vce_oam0_port_network_role_tag:
       type: string
       required: true
+    port_vce_oam0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vce_SRIOV1_0_port_order:
       type: integer
       required: true
@@ -97,6 +107,11 @@ topology_template:
     port_vce_SRIOV2_0_port_order:
       type: integer
       required: true
+    port_vce_SRIOV1_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_vce_availability_zone:
       type: list
       required: true
@@ -243,6 +258,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vce_SRIOV2_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_vce_SRIOV2_0_port_related_networks
         ip_requirements:
           get_input: port_vce_SRIOV2_0_port_ip_requirements
         network_role_tag:
@@ -280,6 +297,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vce_oam0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_vce_oam0_port_related_networks
         ip_requirements:
           get_input: port_vce_oam0_port_ip_requirements
         network_role_tag:
@@ -329,6 +348,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vce_SRIOV1_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_vce_SRIOV1_0_port_related_networks
         ip_requirements:
           get_input: port_vce_SRIOV1_0_port_ip_requirements
         network_role_tag:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9367445..f32cc59 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1048,6 +1048,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_pcm_port_3_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1086,6 +1092,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_3_network:
         type: list
         required: true
@@ -1594,6 +1606,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
@@ -1613,6 +1631,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
@@ -2126,6 +2150,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1c2_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_t2_port_network_role:
         type: string
         required: true
@@ -2166,6 +2196,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_1c2_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -2682,6 +2718,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
@@ -2726,6 +2768,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -3271,6 +3319,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t1_port_ip_requirements:
         type: list
         required: true
@@ -3307,6 +3361,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -3831,6 +3891,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_t2_port_network_role_tag:
         type: string
         required: true
@@ -3839,6 +3905,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1c1_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_t1_port_ip_requirements:
         type: list
         required: true
@@ -4456,6 +4528,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1a_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t2_port_ip_requirements:
         type: list
         required: true
@@ -4492,6 +4570,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_1a_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t1_port_network_role_tag:
         type: string
         required: true
@@ -4990,6 +5074,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t1_port_ip_requirements:
         type: list
         required: true
@@ -5026,6 +5116,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -5536,4 +5632,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index d83e7cc..03cc64c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -24,12 +24,22 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_1c1_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c1_t2_port_network_role_tag:
       type: string
       required: true
     vm_flavor_name:
       type: string
       required: true
+    port_1c1_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c1_t1_port_ip_requirements:
       type: list
       required: true
@@ -150,6 +160,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1c1_t1_port_ip_requirements
+        related_networks:
+          get_input: port_1c1_t1_port_related_networks
         network_role_tag:
           get_input: port_1c1_t1_port_network_role_tag
         network_role:
@@ -214,6 +226,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1c1_t2_port_ip_requirements
+        related_networks:
+          get_input: port_1c1_t2_port_related_networks
         network_role_tag:
           get_input: port_1c1_t2_port_network_role_tag
         network_role:
@@ -472,4 +486,4 @@ topology_template:
       - link
       local_storage_1c1_scalling_instance:
       - 1c1_scalling_instance
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index 9178a58..f3cf786 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -22,6 +22,11 @@ topology_template:
     port_1c2_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1c2_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c2_t2_port_network_role:
       type: string
       required: true
@@ -53,6 +58,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_1c2_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c2_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -151,6 +161,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1c2_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1c2_t2_port_related_networks
         ip_requirements:
           get_input: port_1c2_t2_port_ip_requirements
         network_role_tag:
@@ -180,6 +192,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1c2_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1c2_t1_port_related_networks
         ip_requirements:
           get_input: port_1c2_t1_port_ip_requirements
         network_role_tag:
@@ -430,4 +444,4 @@ topology_template:
       - dependency
       link_1c2_catalog_instance_1c2_t2_port:
       - 1c2_catalog_instance_1c2_t2_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
index 3a130a9..98912ac 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
@@ -49,6 +49,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_1a_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1a_t2_port_ip_requirements:
       type: list
       required: true
@@ -79,6 +84,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1a_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1a_t1_port_network_role_tag:
       type: string
       required: true
@@ -124,6 +134,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1a_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1a_t1_port_related_networks
         ip_requirements:
           get_input: port_1a_t1_port_ip_requirements
         network_role_tag:
@@ -180,6 +192,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1a_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1a_t2_port_related_networks
         ip_requirements:
           get_input: port_1a_t2_port_ip_requirements
         network_role_tag:
@@ -430,4 +444,4 @@ topology_template:
       - dependency
       local_storage_a_single_1a:
       - a_single_1a
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml
index 35a7e09..163cde4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml
@@ -23,6 +23,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_1b_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t1_port_ip_requirements:
       type: list
       required: true
@@ -51,6 +56,11 @@ topology_template:
     port_1b_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1b_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -146,6 +156,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t1_port_related_networks
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
@@ -175,6 +187,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t2_port_related_networks
         ip_requirements:
           get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
@@ -425,4 +439,4 @@ topology_template:
       - link
       dependency_b_single_1b_1b_t2_port:
       - b_single_1b_1b_t2_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 1473c76..d2a4c87 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -23,6 +23,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_1b_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t1_port_ip_requirements:
       type: list
       required: true
@@ -51,6 +56,11 @@ topology_template:
     port_1b_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1b_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -142,6 +152,10 @@ topology_template:
     b_single_1b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_1b_t1_port_mac_requirements
+        order:
+          get_input: port_1b_t1_port_order
         value_specs:
           get_input:
           - port_1b_t1_port_value_specs
@@ -153,12 +167,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
+        related_networks:
+          get_input: port_1b_t1_port_related_networks
         network_role_tag:
           get_input: port_1b_t1_port_network_role_tag
-        mac_requirements:
-          get_input: port_1b_t1_port_mac_requirements
-        order:
-          get_input: port_1b_t1_port_order
         network_role:
           get_input: port_1b_t1_port_network_role
         subnetpoolid:
@@ -180,6 +192,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t2_port_related_networks
         ip_requirements:
           get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
@@ -430,4 +444,4 @@ topology_template:
       - link
       dependency_b_single_1b_1b_t2_port:
       - b_single_1b_1b_t2_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml
index 42c8b54..3b3e7bc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml
@@ -89,6 +89,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_pcm_port_3_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -120,6 +125,11 @@ topology_template:
     port_pcm_port_2_network_role_tag:
       type: string
       required: true
+    port_pcm_port_2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_3_network:
       type: list
       required: true
@@ -181,6 +191,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_3_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_3_related_networks
         network_role_tag:
           get_input: port_pcm_port_3_network_role_tag
         network_role:
@@ -218,6 +230,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_2_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_2_related_networks
         network_role_tag:
           get_input: port_pcm_port_2_network_role_tag
         network_role:
@@ -453,4 +467,4 @@ topology_template:
       - link
       link_pcma_server_pcm_port_3:
       - pcma_server_pcm_port_3
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml
index d42796a..a149bdc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_pcm_port_0_network_role:
       type: string
       required: true
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_network_role_tag:
       type: string
       required: true
@@ -49,6 +54,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -172,6 +182,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
         network_role:
@@ -209,6 +221,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
         network_role:
@@ -444,4 +458,4 @@ topology_template:
       - link
       dependency_pcma_server_pcm_port_0:
       - pcma_server_pcm_port_0
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
index 5dc6de3..c5b67a5 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -69,6 +69,11 @@ topology_template:
     port_pcm_port_00_network_role:
       type: string
       required: true
+    port_pcm_port_00_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_00_ip_requirements:
       type: list
       required: true
@@ -88,6 +93,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_01_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     security_group_name:
       label: security group name
       hidden: false
@@ -157,6 +167,12 @@ topology_template:
     pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_00_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_00_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_00_ip_requirements
         security_groups:
@@ -166,8 +182,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_00_mac_requirements
         subinterface_indicator: false
@@ -177,8 +191,6 @@ topology_template:
           get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_00_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_00_order
       requirements:
@@ -205,6 +217,12 @@ topology_template:
     pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_01_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_01_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_01_ip_requirements
         security_groups:
@@ -214,8 +232,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_01_mac_requirements
         subinterface_indicator: false
@@ -225,8 +241,6 @@ topology_template:
           get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_01_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_01_order
       requirements:
@@ -464,4 +478,4 @@ topology_template:
       - link
       dependency_server_pcm:
       - server_pcm
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 20f2eca..f444f3a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1044,6 +1044,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_pcm_port_3_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1082,6 +1088,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_3_network:
         type: list
         required: true
@@ -1529,6 +1541,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -1561,6 +1579,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -2118,6 +2142,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1c2_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_t2_port_network_role:
         type: string
         required: true
@@ -2158,6 +2188,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_1c2_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -2664,6 +2700,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.pcma_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -2712,6 +2754,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -3241,124 +3289,136 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1b_t2_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_1b_t1_port_order:
+        type: integer
         required: true
         status: SUPPORTED
-      compute_b_single_1b_availability_zone:
-        type: list
+      port_1b_t1_port_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_b_single_1b_scheduler_hints:
-        type: list
+      port_1b_t1_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
-      port_1b_t1_port_order:
-        type: integer
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_1b_t2_port_vlan_requirements:
+      port_1b_t2_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_1b_t2_port_ip_requirements:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_1b_t1_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_1b_t1_port_network_role:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      vm_flavor_name:
+      port_1b_t2_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_network_role_tag:
-        type: string
+      port_1b_t2_port_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_1b_t1_port_ip_requirements:
+      compute_b_single_1b_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_image_name:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_subnetpoolid:
+      port_1b_t2_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_mac_requirements:
+      port_1b_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_1b_t2_port_network:
+      compute_b_single_1b_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t2_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_order:
+      index_value:
         type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      compute_b_single_1b_scheduler_hints:
+        type: list
         required: true
         status: SUPPORTED
-      port_1b_t1_port_vlan_requirements:
+        entry_schema:
+          type: json
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      compute_b_single_1b_user_data_format:
+      port_1b_t2_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1b_t2_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_1b_t1_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      compute_b_single_1b_name:
+      port_1b_t1_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t2_port_network_role_tag:
-        type: string
+      port_1b_t1_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_1b_t2_port_subnetpoolid:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_b_single_1b_name:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       b_single_1b_instance_name:
         type: string
@@ -3811,6 +3871,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_t2_port_network_role_tag:
         type: string
         required: true
@@ -3819,6 +3885,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1c1_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_t1_port_ip_requirements:
         type: list
         required: true
@@ -4421,6 +4493,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1a_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t2_port_ip_requirements:
         type: list
         required: true
@@ -4457,6 +4535,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_1a_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t1_port_network_role_tag:
         type: string
         required: true
@@ -4955,6 +5039,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t1_port_ip_requirements:
         type: list
         required: true
@@ -4991,6 +5081,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -5558,4 +5654,4 @@ node_types:
         type: tosca.capabilities.Endpoint
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
index 0556b0b..a7aec72 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
@@ -243,6 +243,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1b_t1_port_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        compute_b_single_1b_user_data_format:
+        - RAW
         port_1b_t2_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -256,23 +268,11 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        port_1b_t1_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network
-        compute_b_single_1b_user_data_format:
-        - RAW
         compute_b_single_1b_name:
         - get_input:
           - b_single_1b_names

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 268118d..15620d7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -24,12 +24,22 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_1c1_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c1_t2_port_network_role_tag:
       type: string
       required: true
     vm_flavor_name:
       type: string
       required: true
+    port_1c1_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c1_t1_port_ip_requirements:
       type: list
       required: true
@@ -145,6 +155,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1c1_t1_port_ip_requirements
+        related_networks:
+          get_input: port_1c1_t1_port_related_networks
         network_role_tag:
           get_input: port_1c1_t1_port_network_role_tag
         network_role:
@@ -205,6 +217,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1c1_t2_port_ip_requirements
+        related_networks:
+          get_input: port_1c1_t2_port_related_networks
         network_role_tag:
           get_input: port_1c1_t2_port_network_role_tag
         network_role:
@@ -457,4 +471,4 @@ topology_template:
       - link
       local_storage_1c1_scalling_instance:
       - 1c1_scalling_instance
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index 2c11c08..ff4f00e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -22,6 +22,11 @@ topology_template:
     port_1c2_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1c2_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c2_t2_port_network_role:
       type: string
       required: true
@@ -53,6 +58,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_1c2_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c2_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -142,6 +152,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1c2_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1c2_t2_port_related_networks
         ip_requirements:
           get_input: port_1c2_t2_port_ip_requirements
         network_role_tag:
@@ -171,6 +183,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1c2_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1c2_t1_port_related_networks
         ip_requirements:
           get_input: port_1c2_t1_port_ip_requirements
         network_role_tag:
@@ -421,4 +435,4 @@ topology_template:
       - dependency
       link_1c2_catalog_instance_1c2_t2_port:
       - 1c2_catalog_instance_1c2_t2_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
index 5169d02..37ef567 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
@@ -44,6 +44,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_1a_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1a_t2_port_ip_requirements:
       type: list
       required: true
@@ -74,6 +79,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1a_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1a_t1_port_network_role_tag:
       type: string
       required: true
@@ -119,6 +129,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1a_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1a_t1_port_related_networks
         ip_requirements:
           get_input: port_1a_t1_port_ip_requirements
         network_role_tag:
@@ -171,6 +183,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1a_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1a_t2_port_related_networks
         ip_requirements:
           get_input: port_1a_t2_port_ip_requirements
         network_role_tag:
@@ -421,4 +435,4 @@ topology_template:
       - dependency
       local_storage_a_single_1a:
       - a_single_1a
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml
index 391eba6..8bf062f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1bServiceTemplate.yaml
@@ -11,6 +11,56 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: integer
+      required: true
+    port_1b_t1_port_network_role:
+      type: string
+      required: true
+    port_1b_t1_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    vm_image_name:
+      type: string
+      required: true
+    port_1b_t2_port_network_role:
+      type: string
+      required: true
+    port_1b_t2_port_order:
+      type: integer
+      required: true
+    compute_b_single_1b_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_1b_t2_port_network_role_tag:
+      type: string
+      required: true
+    port_1b_t2_port_subnetpoolid:
+      type: string
+      required: true
+    port_1b_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -31,9 +81,6 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t1_port_order:
-      type: integer
-      required: true
     port_1b_t2_port_vlan_requirements:
       type: list
       required: true
@@ -44,26 +91,9 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_1b_t1_port_network_role:
-      type: string
-      required: true
-    port_1b_t1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    vm_flavor_name:
-      type: string
-      required: true
     port_1b_t1_port_network_role_tag:
       type: string
       required: true
-    port_1b_t1_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    vm_image_name:
-      type: string
-      required: true
     port_1b_t1_port_subnetpoolid:
       type: string
       required: true
@@ -75,36 +105,16 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1b_t2_port_network_role:
-      type: string
-      required: true
-    port_1b_t2_port_order:
-      type: integer
-      required: true
     port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    compute_b_single_1b_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_1b_t2_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     compute_b_single_1b_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1b_t2_port_network_role_tag:
-      type: string
-      required: true
-    port_1b_t2_port_subnetpoolid:
-      type: string
-      required: true
   node_templates:
     b_single_1b:
       type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_1b
@@ -137,6 +147,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t1_port_related_networks
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
@@ -166,6 +178,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t2_port_related_networks
         ip_requirements:
           get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
@@ -416,4 +430,4 @@ topology_template:
       - link
       dependency_b_single_1b_1b_t2_port:
       - b_single_1b_1b_t2_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
index ed3dde7..1da7eb2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -23,6 +23,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_1b_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t1_port_ip_requirements:
       type: list
       required: true
@@ -51,6 +56,11 @@ topology_template:
     port_1b_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1b_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -142,6 +152,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t1_port_related_networks
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
@@ -171,6 +183,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t2_port_related_networks
         ip_requirements:
           get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
@@ -421,4 +435,4 @@ topology_template:
       - link
       dependency_b_single_1b_1b_t2_port:
       - b_single_1b_1b_t2_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
index 42c8b54..3b3e7bc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml
@@ -89,6 +89,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_pcm_port_3_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -120,6 +125,11 @@ topology_template:
     port_pcm_port_2_network_role_tag:
       type: string
       required: true
+    port_pcm_port_2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_3_network:
       type: list
       required: true
@@ -181,6 +191,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_3_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_3_related_networks
         network_role_tag:
           get_input: port_pcm_port_3_network_role_tag
         network_role:
@@ -218,6 +230,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_2_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_2_related_networks
         network_role_tag:
           get_input: port_pcm_port_2_network_role_tag
         network_role:
@@ -453,4 +467,4 @@ topology_template:
       - link
       link_pcma_server_pcm_port_3:
       - pcma_server_pcm_port_3
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
index 502244f..25ffdd1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -49,6 +54,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -172,6 +182,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
         network_role:
@@ -209,6 +221,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
         network_role:
@@ -444,4 +458,4 @@ topology_template:
       - link
       dependency_pcma_server_pcm_port_0:
       - pcma_server_pcm_port_0
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
index d8b2255..b6d9653 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -40,6 +45,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -153,6 +163,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -162,8 +178,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -173,8 +187,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -201,6 +213,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -210,8 +228,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -221,8 +237,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -460,4 +474,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7a1ce85..5e7d30f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1044,6 +1044,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_pcm_port_3_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1082,6 +1088,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_3_network:
         type: list
         required: true
@@ -1590,6 +1602,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
@@ -1605,6 +1623,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
@@ -2118,6 +2142,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1c2_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_t2_port_network_role:
         type: string
         required: true
@@ -2158,6 +2188,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_1c2_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c2_t1_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -2668,6 +2704,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
@@ -2712,6 +2754,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -3241,124 +3289,136 @@ node_types:
   org.openecomp.resource.abstract.nodes.b_single_1b:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_1b_t2_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_1b_t1_port_order:
+        type: integer
         required: true
         status: SUPPORTED
-      compute_b_single_1b_availability_zone:
-        type: list
+      port_1b_t1_port_network_role:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_b_single_1b_scheduler_hints:
-        type: list
+      port_1b_t1_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
-      port_1b_t1_port_order:
-        type: integer
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_1b_t2_port_vlan_requirements:
+      port_1b_t2_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_1b_t2_port_ip_requirements:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_1b_t1_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_1b_t1_port_network_role:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      vm_flavor_name:
+      port_1b_t2_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_network_role_tag:
-        type: string
+      port_1b_t2_port_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_1b_t1_port_ip_requirements:
+      compute_b_single_1b_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_image_name:
+          type: string
+      port_1b_t2_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_subnetpoolid:
+      port_1b_t2_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_1b_t1_port_mac_requirements:
+      port_1b_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_1b_t2_port_network:
+      compute_b_single_1b_availability_zone:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t2_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_1b_t2_port_order:
+      index_value:
         type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      compute_b_single_1b_scheduler_hints:
+        type: list
         required: true
         status: SUPPORTED
-      port_1b_t1_port_vlan_requirements:
+        entry_schema:
+          type: json
+      port_1b_t2_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      compute_b_single_1b_user_data_format:
+      port_1b_t2_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_1b_t2_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_1b_t1_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      compute_b_single_1b_name:
+      port_1b_t1_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_1b_t1_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_1b_t2_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_1b_t2_port_network_role_tag:
-        type: string
+      port_1b_t1_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_1b_t2_port_subnetpoolid:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_b_single_1b_name:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
     attributes:
       b_single_1b_instance_name:
         type: string
@@ -3811,6 +3871,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_t2_port_network_role_tag:
         type: string
         required: true
@@ -3819,6 +3885,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1c1_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_t1_port_ip_requirements:
         type: list
         required: true
@@ -4421,6 +4493,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1a_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t2_port_ip_requirements:
         type: list
         required: true
@@ -4457,6 +4535,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_1a_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t1_port_network_role_tag:
         type: string
         required: true
@@ -4955,6 +5039,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t1_port_ip_requirements:
         type: list
         required: true
@@ -4991,6 +5081,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -5495,4 +5591,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
index 9c5f7f8..e9a5f1b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
@@ -216,6 +216,18 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name:
+          get_input: pd_flavor_name
+        port_1b_t1_port_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        vm_image_name:
+          get_input: pd_image_name
+        compute_b_single_1b_user_data_format:
+        - RAW
         port_1b_t2_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -229,23 +241,11 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        vm_flavor_name:
-          get_input: pd_flavor_name
-        port_1b_t1_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        vm_image_name:
-          get_input: pd_image_name
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
         port_1b_t2_port_network:
         - b_single_1b_network
-        compute_b_single_1b_user_data_format:
-        - RAW
         compute_b_single_1b_name:
         - get_input:
           - b_single_1b_names

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 268118d..15620d7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -24,12 +24,22 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_1c1_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c1_t2_port_network_role_tag:
       type: string
       required: true
     vm_flavor_name:
       type: string
       required: true
+    port_1c1_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c1_t1_port_ip_requirements:
       type: list
       required: true
@@ -145,6 +155,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1c1_t1_port_ip_requirements
+        related_networks:
+          get_input: port_1c1_t1_port_related_networks
         network_role_tag:
           get_input: port_1c1_t1_port_network_role_tag
         network_role:
@@ -205,6 +217,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1c1_t2_port_ip_requirements
+        related_networks:
+          get_input: port_1c1_t2_port_related_networks
         network_role_tag:
           get_input: port_1c1_t2_port_network_role_tag
         network_role:
@@ -457,4 +471,4 @@ topology_template:
       - link
       local_storage_1c1_scalling_instance:
       - 1c1_scalling_instance
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index 2c11c08..ff4f00e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -22,6 +22,11 @@ topology_template:
     port_1c2_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1c2_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c2_t2_port_network_role:
       type: string
       required: true
@@ -53,6 +58,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_1c2_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c2_t1_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -142,6 +152,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1c2_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1c2_t2_port_related_networks
         ip_requirements:
           get_input: port_1c2_t2_port_ip_requirements
         network_role_tag:
@@ -171,6 +183,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1c2_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1c2_t1_port_related_networks
         ip_requirements:
           get_input: port_1c2_t1_port_ip_requirements
         network_role_tag:
@@ -421,4 +435,4 @@ topology_template:
       - dependency
       link_1c2_catalog_instance_1c2_t2_port:
       - 1c2_catalog_instance_1c2_t2_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
index 5169d02..37ef567 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
@@ -44,6 +44,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_1a_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1a_t2_port_ip_requirements:
       type: list
       required: true
@@ -74,6 +79,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1a_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1a_t1_port_network_role_tag:
       type: string
       required: true
@@ -119,6 +129,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1a_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1a_t1_port_related_networks
         ip_requirements:
           get_input: port_1a_t1_port_ip_requirements
         network_role_tag:
@@ -171,6 +183,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1a_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1a_t2_port_related_networks
         ip_requirements:
           get_input: port_1a_t2_port_ip_requirements
         network_role_tag:
@@ -421,4 +435,4 @@ topology_template:
       - dependency
       local_storage_a_single_1a:
       - a_single_1a
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml
index 391eba6..8bf062f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1bServiceTemplate.yaml
@@ -11,6 +11,56 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: integer
+      required: true
+    port_1b_t1_port_network_role:
+      type: string
+      required: true
+    port_1b_t1_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1b_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    vm_image_name:
+      type: string
+      required: true
+    port_1b_t2_port_network_role:
+      type: string
+      required: true
+    port_1b_t2_port_order:
+      type: integer
+      required: true
+    compute_b_single_1b_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_1b_t2_port_network_role_tag:
+      type: string
+      required: true
+    port_1b_t2_port_subnetpoolid:
+      type: string
+      required: true
+    port_1b_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -31,9 +81,6 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_1b_t1_port_order:
-      type: integer
-      required: true
     port_1b_t2_port_vlan_requirements:
       type: list
       required: true
@@ -44,26 +91,9 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_1b_t1_port_network_role:
-      type: string
-      required: true
-    port_1b_t1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    vm_flavor_name:
-      type: string
-      required: true
     port_1b_t1_port_network_role_tag:
       type: string
       required: true
-    port_1b_t1_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    vm_image_name:
-      type: string
-      required: true
     port_1b_t1_port_subnetpoolid:
       type: string
       required: true
@@ -75,36 +105,16 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1b_t2_port_network_role:
-      type: string
-      required: true
-    port_1b_t2_port_order:
-      type: integer
-      required: true
     port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    compute_b_single_1b_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_1b_t2_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     compute_b_single_1b_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1b_t2_port_network_role_tag:
-      type: string
-      required: true
-    port_1b_t2_port_subnetpoolid:
-      type: string
-      required: true
   node_templates:
     b_single_1b:
       type: org.openecomp.resource.vfc.compute.nodes.heat.b_single_1b
@@ -137,6 +147,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t1_port_related_networks
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
@@ -166,6 +178,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t2_port_related_networks
         ip_requirements:
           get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
@@ -416,4 +430,4 @@ topology_template:
       - link
       dependency_b_single_1b_1b_t2_port:
       - b_single_1b_1b_t2_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
index ed3dde7..1da7eb2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -23,6 +23,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_1b_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t1_port_ip_requirements:
       type: list
       required: true
@@ -51,6 +56,11 @@ topology_template:
     port_1b_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1b_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -142,6 +152,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t1_port_related_networks
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
@@ -171,6 +183,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t2_port_related_networks
         ip_requirements:
           get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
@@ -421,4 +435,4 @@ topology_template:
       - link
       dependency_b_single_1b_1b_t2_port:
       - b_single_1b_1b_t2_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml
index 42c8b54..3b3e7bc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_serverServiceTemplate.yaml
@@ -89,6 +89,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_pcm_port_3_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -120,6 +125,11 @@ topology_template:
     port_pcm_port_2_network_role_tag:
       type: string
       required: true
+    port_pcm_port_2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_3_network:
       type: list
       required: true
@@ -181,6 +191,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_3_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_3_related_networks
         network_role_tag:
           get_input: port_pcm_port_3_network_role_tag
         network_role:
@@ -218,6 +230,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_2_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_2_related_networks
         network_role_tag:
           get_input: port_pcm_port_2_network_role_tag
         network_role:
@@ -453,4 +467,4 @@ topology_template:
       - link
       link_pcma_server_pcm_port_3:
       - pcma_server_pcm_port_3
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml
index d42796a..a149bdc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_pcm_port_0_network_role:
       type: string
       required: true
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_network_role_tag:
       type: string
       required: true
@@ -49,6 +54,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -172,6 +182,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
         network_role:
@@ -209,6 +221,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
         network_role:
@@ -444,4 +458,4 @@ topology_template:
       - link
       dependency_pcma_server_pcm_port_0:
       - pcma_server_pcm_port_0
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
index 7b34372..d9101cb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -69,6 +69,11 @@ topology_template:
     port_pcm_port_00_network_role:
       type: string
       required: true
+    port_pcm_port_00_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_00_ip_requirements:
       type: list
       required: true
@@ -84,6 +89,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_01_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     security_group_name:
       label: security group name
       hidden: false
@@ -153,6 +163,12 @@ topology_template:
     pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_00_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_00_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_00_ip_requirements
         security_groups:
@@ -162,8 +178,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_00_mac_requirements
         subinterface_indicator: false
@@ -173,8 +187,6 @@ topology_template:
           get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_00_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_00_order
       requirements:
@@ -201,6 +213,12 @@ topology_template:
     pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_01_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_01_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_01_ip_requirements
         security_groups:
@@ -210,8 +228,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_01_mac_requirements
         subinterface_indicator: false
@@ -221,8 +237,6 @@ topology_template:
           get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_01_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_01_order
       requirements:
@@ -460,4 +474,4 @@ topology_template:
       - link
       dependency_server_pcm:
       - server_pcm
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 278deb8..3821ce1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1000,6 +1000,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_t1_port_ip_requirements:
         type: list
         required: true
@@ -1457,6 +1463,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
@@ -1476,6 +1488,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
@@ -2025,6 +2043,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_1c1_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c1_t1_port_ip_requirements:
         type: list
         required: true
@@ -2519,6 +2543,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_pcm_port_3_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -2557,6 +2587,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_3_network:
         type: list
         required: true
@@ -3065,6 +3101,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
@@ -3084,6 +3126,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
@@ -3697,6 +3745,18 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1c201_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_2c202_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c201_port_network_role:
         type: string
         required: true
@@ -4248,6 +4308,18 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1c201_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_2c202_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1c201_port_network_role:
         type: string
         required: true
@@ -4730,6 +4802,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_1a_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t1_port_network_role_tag:
         type: string
         required: true
@@ -5147,6 +5225,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_network_role_tag:
         type: string
         required: true
@@ -5191,6 +5275,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -5736,6 +5826,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t1_port_ip_requirements:
         type: list
         required: true
@@ -5772,6 +5868,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -6334,6 +6436,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1a_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t2_port_ip_requirements:
         type: list
         required: true
@@ -6370,6 +6478,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_1a_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1a_t1_port_network_role_tag:
         type: string
         required: true
@@ -6868,6 +6982,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t1_port_ip_requirements:
         type: list
         required: true
@@ -6904,6 +7024,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t2_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -7428,6 +7554,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_1b_t1_port_ip_requirements:
         type: list
         required: true
@@ -7464,6 +7596,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_b_single_2b_availability_zone:
         type: list
         required: true
@@ -7991,6 +8129,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_b_single_2b_metadata:
         type: list
         required: true
@@ -8033,6 +8177,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_1b_t1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_b_single_2b_availability_zone:
         type: list
         required: true
@@ -8528,4 +8678,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
index a2e1f59..8640992 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
@@ -52,6 +52,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_1c1_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c1_t1_port_ip_requirements:
       type: list
       required: true
@@ -125,6 +130,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1c1_t1_port_ip_requirements
+        related_networks:
+          get_input: port_1c1_t1_port_related_networks
         network_role_tag:
           get_input: port_1c1_t1_port_network_role_tag
         network_role:
@@ -335,4 +342,4 @@ topology_template:
       - link
       dependency_1c11_scalling_instance:
       - 1c11_scalling_instance
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
index 2a4e09b..31686e8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
@@ -52,6 +52,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_1c1_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c1_t1_port_ip_requirements:
       type: list
       required: true
@@ -102,6 +107,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1c1_t1_port_ip_requirements
+        related_networks:
+          get_input: port_1c1_t1_port_related_networks
         network_role_tag:
           get_input: port_1c1_t1_port_network_role_tag
         network_role:
@@ -335,4 +342,4 @@ topology_template:
       - dependency
       link_1c12_scalling_instance_1c1_t1_port:
       - 1c12_scalling_instance_1c1_t1_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index 2d3c227..6271474 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -97,6 +97,16 @@ topology_template:
     port_1c201_port_subnetpoolid:
       type: string
       required: true
+    port_1c201_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_2c202_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c201_port_network_role:
       type: string
       required: true
@@ -155,6 +165,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1c201_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1c201_port_related_networks
         ip_requirements:
           get_input: port_1c201_port_ip_requirements
         network_role_tag:
@@ -184,6 +196,8 @@ topology_template:
         vlan_requirements:
           get_input: port_2c202_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_2c202_port_related_networks
         ip_requirements:
           get_input: port_2c202_port_ip_requirements
         network_role_tag:
@@ -434,4 +448,4 @@ topology_template:
       - link
       dependency_1c2_catalog_instance_1c201_port:
       - 1c2_catalog_instance_1c201_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml
index eb8dd39..5b15894 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_2c2_catalog_instanceServiceTemplate.yaml
@@ -102,6 +102,16 @@ topology_template:
     port_1c201_port_subnetpoolid:
       type: string
       required: true
+    port_1c201_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_2c202_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1c201_port_network_role:
       type: string
       required: true
@@ -142,6 +152,8 @@ topology_template:
         vlan_requirements:
           get_input: port_2c202_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_2c202_port_related_networks
         ip_requirements:
           get_input: port_2c202_port_ip_requirements
         network_role_tag:
@@ -171,6 +183,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1c201_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1c201_port_related_networks
         ip_requirements:
           get_input: port_1c201_port_ip_requirements
         network_role_tag:
@@ -415,4 +429,4 @@ topology_template:
       - dependency
       link_2c2_catalog_instance_2c202_port:
       - 2c2_catalog_instance_2c202_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
index 3a130a9..98912ac 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
@@ -49,6 +49,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_1a_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1a_t2_port_ip_requirements:
       type: list
       required: true
@@ -79,6 +84,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1a_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1a_t1_port_network_role_tag:
       type: string
       required: true
@@ -124,6 +134,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1a_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1a_t1_port_related_networks
         ip_requirements:
           get_input: port_1a_t1_port_ip_requirements
         network_role_tag:
@@ -180,6 +192,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1a_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1a_t2_port_related_networks
         ip_requirements:
           get_input: port_1a_t2_port_ip_requirements
         network_role_tag:
@@ -430,4 +444,4 @@ topology_template:
       - dependency
       local_storage_a_single_1a:
       - a_single_1a
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
index 456e828..34c13ba 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_1a_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1a_t1_port_network_role_tag:
       type: string
       required: true
@@ -118,6 +123,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1a_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1a_t1_port_related_networks
         ip_requirements:
           get_input: port_1a_t1_port_ip_requirements
         network_role_tag:
@@ -320,4 +327,4 @@ topology_template:
       - link
       local_storage_a_single_2a:
       - a_single_2a
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml
index 0074e70..82eb0a0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1bServiceTemplate.yaml
@@ -23,6 +23,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_1b_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t1_port_ip_requirements:
       type: list
       required: true
@@ -51,6 +56,11 @@ topology_template:
     port_1b_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1b_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -142,6 +152,10 @@ topology_template:
     b_single_1b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_1b_t1_port_mac_requirements
+        order:
+          get_input: port_1b_t1_port_order
         value_specs:
           get_input:
           - port_1b_t1_port_value_specs
@@ -153,12 +167,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
+        related_networks:
+          get_input: port_1b_t1_port_related_networks
         network_role_tag:
           get_input: port_1b_t1_port_network_role_tag
-        mac_requirements:
-          get_input: port_1b_t1_port_mac_requirements
-        order:
-          get_input: port_1b_t1_port_order
         network_role:
           get_input: port_1b_t1_port_network_role
         subnetpoolid:
@@ -180,6 +192,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t2_port_related_networks
         ip_requirements:
           get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
@@ -430,4 +444,4 @@ topology_template:
       - link
       dependency_b_single_1b_1b_t2_port:
       - b_single_1b_1b_t2_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 00901d4..488f239 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -23,6 +23,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_1b_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t1_port_ip_requirements:
       type: list
       required: true
@@ -51,6 +56,11 @@ topology_template:
     port_1b_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1b_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t2_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -146,6 +156,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t1_port_related_networks
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
@@ -175,6 +187,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t2_port_related_networks
         ip_requirements:
           get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
@@ -425,4 +439,4 @@ topology_template:
       - link
       dependency_b_single_1b_1b_t2_port:
       - b_single_1b_1b_t2_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml
index 4906516..58e103e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2bServiceTemplate.yaml
@@ -23,6 +23,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_1b_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_1b_t1_port_ip_requirements:
       type: list
       required: true
@@ -51,6 +56,11 @@ topology_template:
     port_1b_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1b_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_b_single_2b_availability_zone:
       type: list
       required: true
@@ -142,6 +152,10 @@ topology_template:
     b_single_2b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_1b_t1_port_mac_requirements
+        order:
+          get_input: port_1b_t1_port_order
         value_specs:
           get_input:
           - port_1b_t1_port_value_specs
@@ -153,12 +167,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
+        related_networks:
+          get_input: port_1b_t1_port_related_networks
         network_role_tag:
           get_input: port_1b_t1_port_network_role_tag
-        mac_requirements:
-          get_input: port_1b_t1_port_mac_requirements
-        order:
-          get_input: port_1b_t1_port_order
         network_role:
           get_input: port_1b_t1_port_network_role
         subnetpoolid:
@@ -180,6 +192,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t2_port_related_networks
         ip_requirements:
           get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
@@ -424,4 +438,4 @@ topology_template:
       - dependency
       dependency_b_single_2b_1b_t1_port:
       - b_single_2b_1b_t1_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
index a7f96eb..25a9238 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
@@ -23,6 +23,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_1b_t2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_b_single_2b_metadata:
       type: list
       required: true
@@ -56,6 +61,11 @@ topology_template:
     port_1b_t2_port_subnetpoolid:
       type: string
       required: true
+    port_1b_t1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_b_single_2b_availability_zone:
       type: list
       required: true
@@ -146,6 +156,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t1_port_related_networks
         ip_requirements:
           get_input: port_1b_t1_port_ip_requirements
         network_role_tag:
@@ -175,6 +187,8 @@ topology_template:
         vlan_requirements:
           get_input: port_1b_t2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_1b_t2_port_related_networks
         ip_requirements:
           get_input: port_1b_t2_port_ip_requirements
         network_role_tag:
@@ -419,4 +433,4 @@ topology_template:
       - dependency
       dependency_b_single_2b_1b_t1_port:
       - b_single_2b_1b_t1_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml
index 42c8b54..3b3e7bc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_serverServiceTemplate.yaml
@@ -89,6 +89,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_pcm_port_3_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -120,6 +125,11 @@ topology_template:
     port_pcm_port_2_network_role_tag:
       type: string
       required: true
+    port_pcm_port_2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_3_network:
       type: list
       required: true
@@ -181,6 +191,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_3_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_3_related_networks
         network_role_tag:
           get_input: port_pcm_port_3_network_role_tag
         network_role:
@@ -218,6 +230,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_2_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_2_related_networks
         network_role_tag:
           get_input: port_pcm_port_2_network_role_tag
         network_role:
@@ -453,4 +467,4 @@ topology_template:
       - link
       link_pcma_server_pcm_port_3:
       - pcma_server_pcm_port_3
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml
index d42796a..a149bdc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_pcma_server_1ServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_pcm_port_0_network_role:
       type: string
       required: true
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_network_role_tag:
       type: string
       required: true
@@ -49,6 +54,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -172,6 +182,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
         network_role:
@@ -209,6 +221,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
         network_role:
@@ -444,4 +458,4 @@ topology_template:
       - link
       dependency_pcma_server_pcm_port_0:
       - pcma_server_pcm_port_0
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
index 5dc6de3..c5b67a5 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -69,6 +69,11 @@ topology_template:
     port_pcm_port_00_network_role:
       type: string
       required: true
+    port_pcm_port_00_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_00_ip_requirements:
       type: list
       required: true
@@ -88,6 +93,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_port_01_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     security_group_name:
       label: security group name
       hidden: false
@@ -157,6 +167,12 @@ topology_template:
     pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_00_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_00_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_00_ip_requirements
         security_groups:
@@ -166,8 +182,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_00_mac_requirements
         subinterface_indicator: false
@@ -177,8 +191,6 @@ topology_template:
           get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_00_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_00_order
       requirements:
@@ -205,6 +217,12 @@ topology_template:
     pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_01_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_01_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_01_ip_requirements
         security_groups:
@@ -214,8 +232,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_01_mac_requirements
         subinterface_indicator: false
@@ -225,8 +241,6 @@ topology_template:
           get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_01_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_01_order
       requirements:
@@ -464,4 +478,4 @@ topology_template:
       - link
       dependency_server_pcm:
       - server_pcm
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 037768d..75e2b7f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -80,6 +80,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_nested2_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_nested2_1b_port_network:
         type: list
         required: true
@@ -734,6 +740,18 @@ node_types:
         description: Flavor for PD server
         required: true
         status: SUPPORTED
+      port_pd_server_pattern4_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd_server_pattern4_port_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_pattern4_port_1_network_role:
         type: string
         required: true
@@ -1287,6 +1305,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_pd_server_pattern4_port_02_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       pd_server_pattern4_image:
         type: string
         description: Flavor for PD server
@@ -1308,6 +1332,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_pattern4_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_pattern4_port_02_network_role_tag:
         type: string
         required: true
@@ -1844,6 +1874,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_pd_server_pattern4_port_02_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       pd_server_pattern4_image:
         type: string
         description: Flavor for PD server
@@ -1865,6 +1901,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_pattern4_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_pattern4_port_02_network_role_tag:
         type: string
         required: true
@@ -2331,6 +2373,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cmaui_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -7024,6 +7072,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_main_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
@@ -9867,6 +9921,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_main_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
@@ -10294,6 +10354,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_main_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
@@ -10798,6 +10864,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_main_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
@@ -11197,6 +11269,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cmaui_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -11630,6 +11708,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps_server_nested2_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_ps_server_nested2_1b_availability_zone:
         type: list
         required: true
@@ -12051,6 +12135,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cmaui_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -12547,6 +12637,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_pd_server_pattern4_port_02_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       pd_server_pattern4_image:
         type: string
         description: Flavor for PD server
@@ -12568,6 +12664,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_pattern4_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_pattern4_port_02_network_role_tag:
         type: string
         required: true
@@ -13008,4 +13110,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml
index ebe44ed..55c1835 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cmaui_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_ip_requirements
+        related_networks:
+          get_input: port_cmaui_port_related_networks
         network_role_tag:
           get_input: port_cmaui_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - local_storage
       dependency_cmaui_1c1_main:
       - cmaui_1c1_main
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml
index 627a385..c68dba0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cmaui_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_ip_requirements
+        related_networks:
+          get_input: port_cmaui_port_related_networks
         network_role_tag:
           get_input: port_cmaui_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - local_storage
       dependency_cmaui_1c1_main:
       - cmaui_1c1_main
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml
index 028c8b3..5541d71 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cmaui_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_ip_requirements
+        related_networks:
+          get_input: port_cmaui_port_related_networks
         network_role_tag:
           get_input: port_cmaui_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - local_storage
       dependency_cmaui_1c1_nested2_cmaui_port:
       - cmaui_1c1_nested2_cmaui_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml
index 6124951..f8f0711 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml
@@ -40,6 +40,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_pd_server_main_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_main_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_main_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_main_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - local_storage
       dependency_pd_server_main_1b_pd_server_main_1b_port:
       - pd_server_main_1b_pd_server_main_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml
index c572dc5..2c92263 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml
@@ -40,6 +40,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_pd_server_main_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_main_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_main_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_main_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - local_storage
       dependency_pd_server_main_1b_pd_server_main_1b_port:
       - pd_server_main_1b_pd_server_main_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml
index 6619eb8..5a29af8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml
@@ -69,6 +69,11 @@ topology_template:
     port_pd_server_nested2_1b_port_network_role_tag:
       type: string
       required: true
+    port_pd_server_nested2_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_nested2_1b_port_network:
       type: list
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_nested2_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_nested2_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_nested2_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       link_pd_server_nested2_1b_pd_server_nested2_1b_port:
       - pd_server_nested2_1b_pd_server_nested2_1b_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml
index 698772d..3f68b28 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml
@@ -51,6 +51,11 @@ topology_template:
     port_ps_server_main_1b_port_network_role_tag:
       type: string
       required: true
+    port_ps_server_main_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_main_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_main_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_main_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       local_storage_ps_server_main_1b:
       - ps_server_main_1b
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml
index 106f165..edb49ea 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml
@@ -51,6 +51,11 @@ topology_template:
     port_ps_server_main_1b_port_network_role_tag:
       type: string
       required: true
+    port_ps_server_main_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_main_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_main_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_main_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       local_storage_ps_server_main_1b:
       - ps_server_main_1b
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml
index 41a8b66..c788016 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml
@@ -34,6 +34,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_ps_server_nested2_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_ps_server_nested2_1b_availability_zone:
       type: list
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_nested2_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_nested2_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_nested2_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       link_ps_server_nested2_1b_ps_server_nested2_1b_port:
       - ps_server_nested2_1b_ps_server_nested2_1b_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml
index 3a9ca34..ba35377 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml
@@ -98,6 +98,16 @@ topology_template:
       immutable: false
       type: string
       description: Flavor for PD server
+    port_pd_server_pattern4_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd_server_pattern4_port_2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_pattern4_port_1_network_role:
       type: string
       required: true
@@ -124,6 +134,12 @@ topology_template:
     pd_server_pattern4_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pd_server_pattern4_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pd_server_pattern4_port_1_related_networks
+        network:
+          get_input: net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_pd_server_pattern4_port_1_ip_requirements
@@ -134,8 +150,6 @@ topology_template:
             get_input:
             - pd_server_pattern4_ips
             - 0
-        subnetpoolid:
-          get_input: port_pd_server_pattern4_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pd_server_pattern4_port_1_mac_requirements
         subinterface_indicator: false
@@ -145,8 +159,6 @@ topology_template:
           get_input: port_pd_server_pattern4_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pd_server_pattern4_port_1_network_role_tag
-        network:
-          get_input: net
         order:
           get_input: port_pd_server_pattern4_port_1_order
       requirements:
@@ -170,6 +182,12 @@ topology_template:
     pd_server_pattern4_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pd_server_pattern4_port_2_subnetpoolid
+        related_networks:
+          get_input: port_pd_server_pattern4_port_2_related_networks
+        network:
+          get_input: net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_pd_server_pattern4_port_2_ip_requirements
@@ -180,8 +198,6 @@ topology_template:
             get_input:
             - pd_server_pattern4_ips
             - 1
-        subnetpoolid:
-          get_input: port_pd_server_pattern4_port_2_subnetpoolid
         mac_requirements:
           get_input: port_pd_server_pattern4_port_2_mac_requirements
         subinterface_indicator: false
@@ -191,8 +207,6 @@ topology_template:
           get_input: port_pd_server_pattern4_port_2_vlan_requirements
         network_role_tag:
           get_input: port_pd_server_pattern4_port_2_network_role_tag
-        network:
-          get_input: net
         order:
           get_input: port_pd_server_pattern4_port_2_order
       requirements:
@@ -430,4 +444,4 @@ topology_template:
       - link
       dependency_server_pd_pattern4_1:
       - server_pd_pattern4_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml
index 695ecf0..640a075 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml
@@ -92,6 +92,11 @@ topology_template:
     port_pd_server_pattern4_port_01_order:
       type: integer
       required: true
+    port_pd_server_pattern4_port_02_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     pd_server_pattern4_image:
       hidden: false
       immutable: false
@@ -110,6 +115,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd_server_pattern4_port_01_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_pattern4_port_02_network_role_tag:
       type: string
       required: true
@@ -124,6 +134,12 @@ topology_template:
     pd_server_pattern4_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pd_server_pattern4_port_01_subnetpoolid
+        related_networks:
+          get_input: port_pd_server_pattern4_port_01_related_networks
+        network:
+          get_input: net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_pd_server_pattern4_port_01_ip_requirements
@@ -134,8 +150,6 @@ topology_template:
             get_input:
             - pd_server_pattern4_ips
             - 0
-        subnetpoolid:
-          get_input: port_pd_server_pattern4_port_01_subnetpoolid
         mac_requirements:
           get_input: port_pd_server_pattern4_port_01_mac_requirements
         subinterface_indicator: false
@@ -145,8 +159,6 @@ topology_template:
           get_input: port_pd_server_pattern4_port_01_vlan_requirements
         network_role_tag:
           get_input: port_pd_server_pattern4_port_01_network_role_tag
-        network:
-          get_input: net
         order:
           get_input: port_pd_server_pattern4_port_01_order
       requirements:
@@ -170,6 +182,12 @@ topology_template:
     pd_server_pattern4_port_02:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pd_server_pattern4_port_02_subnetpoolid
+        related_networks:
+          get_input: port_pd_server_pattern4_port_02_related_networks
+        network:
+          get_input: net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_pd_server_pattern4_port_02_ip_requirements
@@ -180,8 +198,6 @@ topology_template:
             get_input:
             - pd_server_pattern4_ips
             - 1
-        subnetpoolid:
-          get_input: port_pd_server_pattern4_port_02_subnetpoolid
         mac_requirements:
           get_input: port_pd_server_pattern4_port_02_mac_requirements
         subinterface_indicator: false
@@ -191,8 +207,6 @@ topology_template:
           get_input: port_pd_server_pattern4_port_02_vlan_requirements
         network_role_tag:
           get_input: port_pd_server_pattern4_port_02_network_role_tag
-        network:
-          get_input: net
         order:
           get_input: port_pd_server_pattern4_port_02_order
       requirements:
@@ -430,4 +444,4 @@ topology_template:
       - link
       dependency_server_pd_pattern4:
       - server_pd_pattern4
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 06e161e..c04600a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -92,6 +92,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -479,6 +485,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_cmaui_port_7_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_7_network_role_tag:
         type: string
         required: true
@@ -573,6 +585,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_cmaui_port_8_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
     - dependency_cmaui_port_7:
         capability: tosca.capabilities.Node
@@ -1054,6 +1072,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_server_port_fixed_ips:
         type: list
         required: true
@@ -4607,6 +4631,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_sm_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_sm_server_port_security_groups:
         type: list
         required: true
@@ -5014,6 +5044,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_ps_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -5387,4 +5423,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml
index b47f6e9..fad2bc2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml
@@ -53,6 +53,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_oam_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_oam_server_port_fixed_ips:
       type: list
       required: true
@@ -118,6 +123,8 @@ topology_template:
         vlan_requirements:
           get_input: port_oam_server_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_oam_server_port_related_networks
         ip_requirements:
           get_input: port_oam_server_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - dependency
       link_oam_server_oam_server_port:
       - oam_server_oam_server_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml
index 3130f3c..b38ff0b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -79,6 +79,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -118,6 +123,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd_server_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd_server_port_related_networks
         ip_requirements:
           get_input: port_pd_server_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - link
       dependency_pd_server_pd_server_port:
       - pd_server_pd_server_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml
index a8789f3..ebdd539 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml
@@ -57,6 +57,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_ps_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -103,6 +108,8 @@ topology_template:
         vlan_requirements:
           get_input: port_ps_server_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_ps_server_port_related_networks
         ip_requirements:
           get_input: port_ps_server_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - link
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml
index 22ec89c..e342b87 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml
@@ -77,6 +77,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_sm_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_sm_server_port_security_groups:
       type: list
       required: true
@@ -118,6 +123,8 @@ topology_template:
         vlan_requirements:
           get_input: port_sm_server_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_sm_server_port_related_networks
         ip_requirements:
           get_input: port_sm_server_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - local_storage
       link_sm_server_sm_server_port:
       - sm_server_sm_server_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml
index 5eccdf3..46515f6 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml
@@ -47,6 +47,11 @@ topology_template:
     port_cmaui_port_8_order:
       type: integer
       required: true
+    port_cmaui_port_7_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cmaui_port_7_network_role_tag:
       type: string
       required: true
@@ -128,12 +133,19 @@ topology_template:
     port_cmaui_port_8_subnetpoolid:
       type: string
       required: true
+    port_cmaui_port_8_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
   node_templates:
     cmaui_port_7:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         subnetpoolid:
           get_input: port_cmaui_port_7_subnetpoolid
+        related_networks:
+          get_input: port_cmaui_port_7_related_networks
         network:
           get_input: net1
         replacement_policy: AUTO
@@ -169,6 +181,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_cmaui_port_8_subnetpoolid
+        related_networks:
+          get_input: port_cmaui_port_8_related_networks
         network:
           get_input: net2
         replacement_policy: AUTO
@@ -439,4 +453,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui:
       - server_cmaui
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a4c69ca..e00b9d0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -84,6 +84,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -447,6 +453,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -886,6 +898,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -1353,6 +1371,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_oam02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_oam_availability_zone:
         type: list
         required: true
@@ -1764,6 +1788,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
@@ -2149,6 +2179,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.cmaui:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_cmaui02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -2644,6 +2680,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_cmaui01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui01_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -6643,6 +6685,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
     - dependency_ps:
         capability: tosca.capabilities.Node
@@ -7716,4 +7764,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml
index c42e264..b7f6826 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_cmaui02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -103,6 +108,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cmaui02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cmaui02_port_related_networks
         ip_requirements:
           get_input: port_cmaui02_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - dependency
       local_storage_cmaui:
       - cmaui
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml
index 95de875..72ebfec 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml
@@ -61,6 +61,11 @@ topology_template:
     port_cmaui01_port_network_role_tag:
       type: string
       required: true
+    port_cmaui01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cmaui01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -103,6 +108,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cmaui01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cmaui01_port_related_networks
         ip_requirements:
           get_input: port_cmaui01_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - dependency
       local_storage_cmaui:
       - cmaui
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml
index 285d94a..87232dd 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml
@@ -67,6 +67,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_oam02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_oam_availability_zone:
       type: list
       required: true
@@ -103,6 +108,8 @@ topology_template:
         vlan_requirements:
           get_input: port_oam02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_oam02_port_related_networks
         ip_requirements:
           get_input: port_oam02_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - dependency
       dependency_oam:
       - oam
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml
index a68212a..f6f3d19 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml
@@ -50,6 +50,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_oam01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
@@ -103,6 +108,8 @@ topology_template:
         vlan_requirements:
           get_input: port_oam01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_oam01_port_related_networks
         ip_requirements:
           get_input: port_oam01_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - link
       dependency_oam:
       - oam
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
index 0102fb5..9d8385b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -72,6 +72,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
index f875aad..34e182d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml
index f55c8f7..1ef6099 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml
@@ -82,6 +82,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
   node_templates:
     ps:
       type: org.openecomp.resource.vfc.compute.nodes.heat.ps
@@ -118,6 +123,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - dependency
       local_storage_ps:
       - ps
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml
index 937a2b3..7c142e6 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml
@@ -26,6 +26,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -118,6 +123,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - dependency
       link_ps_pd01_port:
       - ps_pd01_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c50219d..1481bf6 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -485,6 +491,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps02_port_subnetpoolid:
         type: string
         required: true
@@ -926,6 +938,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -1295,6 +1313,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -1716,6 +1740,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -2189,6 +2219,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -2610,6 +2646,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -2979,6 +3021,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -7644,4 +7692,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
index 9ce1d48..2d01270 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
index cc30916..c46b8e7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -72,6 +72,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml
index a3c3294..7ecfd2d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -72,6 +72,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml
index f450366..a802e13 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml
index 62ab62f..752fc03 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml
index 0ef4cda..6e87a88 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml
@@ -56,6 +56,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_ps02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps02_port_subnetpoolid:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_ps02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_ps02_port_related_networks
         ip_requirements:
           get_input: port_ps02_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server_ps02_port:
       - pd_server_ps02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml
index 61f33e6..1289e6e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml
@@ -72,6 +72,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml
index 5423f41..4c81d47 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index beb3e3d..23264fd 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -515,6 +521,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_osm_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_osm_server_1c2_metadata:
         type: list
         required: true
@@ -912,6 +924,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -1388,6 +1406,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_1_network_role_tag:
         type: string
         required: true
@@ -1414,6 +1438,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_pd_server_port_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_2_network_role_tag:
         type: string
         required: true
@@ -1913,6 +1943,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
@@ -2364,6 +2400,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_BE_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
@@ -5401,6 +5443,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
@@ -5868,6 +5916,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_rd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     attributes:
       rd_server_1b_accessIPv4:
         type: string
@@ -6578,6 +6632,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_1_network_role_tag:
         type: string
         required: true
@@ -6603,6 +6663,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_pd_server_port_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_2_network_role_tag:
         type: string
         required: true
@@ -7134,6 +7200,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_1_network_role_tag:
         type: string
         required: true
@@ -7159,6 +7231,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_pd_server_port_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_2_network_role_tag:
         type: string
         required: true
@@ -7638,6 +7716,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cmaui_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -8043,4 +8127,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml
index f96e8a6..5833cce 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml
@@ -64,6 +64,11 @@ topology_template:
     port_BE_port_network_role_tag:
       type: string
       required: true
+    port_BE_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_BE_port_ip_requirements
+        related_networks:
+          get_input: port_BE_port_related_networks
         network_role_tag:
           get_input: port_BE_port_network_role_tag
         network_role:
@@ -311,4 +318,4 @@ topology_template:
       - dependency
       dependency_BE_1c1:
       - BE_1c1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml
index 4f66738..334e680 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cmaui_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_ip_requirements
+        related_networks:
+          get_input: port_cmaui_port_related_networks
         network_role_tag:
           get_input: port_cmaui_port_network_role_tag
         network_role:
@@ -311,4 +318,4 @@ topology_template:
       - link
       local_storage_cmaui_1c1:
       - cmaui_1c1
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml
index 6dbb4c2..5ad7f5d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml
@@ -40,6 +40,11 @@ topology_template:
     port_oam_port_subnetpoolid:
       type: string
       required: true
+    port_oam_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -120,6 +125,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_oam_port_ip_requirements
+        related_networks:
+          get_input: port_oam_port_related_networks
         network_role_tag:
           get_input: port_oam_port_network_role_tag
         network_role:
@@ -320,4 +327,4 @@ topology_template:
       - link
       dependency_oam_server_1c2_oam_port:
       - oam_server_1c2_oam_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml
index e7e5928..867f972 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml
@@ -72,6 +72,11 @@ topology_template:
     port_osm_port_order:
       type: integer
       required: true
+    port_osm_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_osm_server_1c2_metadata:
       type: list
       required: true
@@ -101,6 +106,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_osm_port_ip_requirements
+        related_networks:
+          get_input: port_osm_port_related_networks
         network_role_tag:
           get_input: port_osm_port_network_role_tag
         network_role:
@@ -320,4 +327,4 @@ topology_template:
       - local_storage
       dependency_osm_server_1c2:
       - osm_server_1c2
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml
index 3e54bf3..4c8a635 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -45,6 +45,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_1b_port_network:
       type: list
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       link_pd_server_1b_ps_server_1b_port:
       - pd_server_1b_ps_server_1b_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml
index f371e78..798ca5a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -311,4 +318,4 @@ topology_template:
       - link
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml
index 2e1aaa5..7406528 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml
@@ -77,6 +77,11 @@ topology_template:
     port_rd_server_1b_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_rd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
   node_templates:
     rd_server_1b_rd_server_1b_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_rd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_rd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_rd_server_1b_port_network_role_tag
         network_role:
@@ -311,4 +318,4 @@ topology_template:
       - local_storage
       link_rd_server_1b_rd_server_1b_port:
       - rd_server_1b_rd_server_1b_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml
index 38f55fa..0016859 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml
@@ -45,6 +45,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_1b_port_network:
       type: list
       required: true
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       link_rd_server_1b_ps_server_1b_port:
       - rd_server_1b_ps_server_1b_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml
index 71db42e..17cbb4a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml
@@ -78,6 +78,11 @@ topology_template:
     port_pd_server_port_1_subnetpoolid:
       type: string
       required: true
+    port_pd_server_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_port_1_network_role_tag:
       type: string
       required: true
@@ -101,6 +106,11 @@ topology_template:
     port_pd_server_port_2_order:
       type: integer
       required: true
+    port_pd_server_port_2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_port_2_network_role_tag:
       type: string
       required: true
@@ -124,6 +134,12 @@ topology_template:
     pd_server_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pd_server_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pd_server_port_1_related_networks
+        network:
+          get_input: net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_pd_server_port_1_ip_requirements
@@ -134,8 +150,6 @@ topology_template:
             get_input:
             - pd_server_ips
             - 0
-        subnetpoolid:
-          get_input: port_pd_server_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pd_server_port_1_mac_requirements
         subinterface_indicator: false
@@ -145,8 +159,6 @@ topology_template:
           get_input: port_pd_server_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pd_server_port_1_network_role_tag
-        network:
-          get_input: net
         order:
           get_input: port_pd_server_port_1_order
       requirements:
@@ -157,6 +169,12 @@ topology_template:
     pd_server_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pd_server_port_2_subnetpoolid
+        related_networks:
+          get_input: port_pd_server_port_2_related_networks
+        network:
+          get_input: net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_pd_server_port_2_ip_requirements
@@ -167,8 +185,6 @@ topology_template:
             get_input:
             - pd_server_ips
             - 1
-        subnetpoolid:
-          get_input: port_pd_server_port_2_subnetpoolid
         mac_requirements:
           get_input: port_pd_server_port_2_mac_requirements
         subinterface_indicator: false
@@ -178,8 +194,6 @@ topology_template:
           get_input: port_pd_server_port_2_vlan_requirements
         network_role_tag:
           get_input: port_pd_server_port_2_network_role_tag
-        network:
-          get_input: net
         order:
           get_input: port_pd_server_port_2_order
       requirements:
@@ -430,4 +444,4 @@ topology_template:
       - dependency
       dependency_pd_server_port_2:
       - pd_server_port_2
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f2f4d34..efded1a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -44,6 +44,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -459,6 +465,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -3087,6 +3099,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
@@ -3500,6 +3518,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cmaui_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -3901,4 +3925,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml
index 61df375..c7ec23e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cmaui_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_ip_requirements
+        related_networks:
+          get_input: port_cmaui_port_related_networks
         network_role_tag:
           get_input: port_cmaui_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       local_storage_cmaui_1c1:
       - cmaui_1c1
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml
index f7dc996..7fd2a85 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml
@@ -40,6 +40,11 @@ topology_template:
     port_oam_port_subnetpoolid:
       type: string
       required: true
+    port_oam_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_oam_port_ip_requirements
+        related_networks:
+          get_input: port_oam_port_related_networks
         network_role_tag:
           get_input: port_oam_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       dependency_oam_server_1c2_oam_port:
       - oam_server_1c2_oam_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml
index c3bad7c..d092114 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml
index 2ee92d2..39d5a7b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -40,6 +40,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_1b_port_network:
       type: list
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       dependency_ps_server_1b:
       - ps_server_1b
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 26be6a1..8735c51 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -44,6 +44,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -514,6 +520,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_1_network_role_tag:
         type: string
         required: true
@@ -540,6 +552,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_pd_server_port_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_2_network_role_tag:
         type: string
         required: true
@@ -1021,6 +1039,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -3941,6 +3965,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
@@ -4354,6 +4384,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cmaui_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -4755,4 +4791,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml
index 61df375..c7ec23e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cmaui_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_ip_requirements
+        related_networks:
+          get_input: port_cmaui_port_related_networks
         network_role_tag:
           get_input: port_cmaui_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       local_storage_cmaui_1c1:
       - cmaui_1c1
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml
index f2c93a1..688ff91 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml
@@ -40,6 +40,11 @@ topology_template:
     port_oam_port_subnetpoolid:
       type: string
       required: true
+    port_oam_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_oam_port_ip_requirements
+        related_networks:
+          get_input: port_oam_port_related_networks
         network_role_tag:
           get_input: port_oam_port_network_role_tag
         network_role:
@@ -311,4 +318,4 @@ topology_template:
       - link
       dependency_oam_server_1c2_oam_port:
       - oam_server_1c2_oam_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml
index c3bad7c..d092114 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml
index 2ee92d2..39d5a7b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -40,6 +40,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_1b_port_network:
       type: list
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       dependency_ps_server_1b:
       - ps_server_1b
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml
index 71db42e..17cbb4a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml
@@ -78,6 +78,11 @@ topology_template:
     port_pd_server_port_1_subnetpoolid:
       type: string
       required: true
+    port_pd_server_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_port_1_network_role_tag:
       type: string
       required: true
@@ -101,6 +106,11 @@ topology_template:
     port_pd_server_port_2_order:
       type: integer
       required: true
+    port_pd_server_port_2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_port_2_network_role_tag:
       type: string
       required: true
@@ -124,6 +134,12 @@ topology_template:
     pd_server_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pd_server_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pd_server_port_1_related_networks
+        network:
+          get_input: net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_pd_server_port_1_ip_requirements
@@ -134,8 +150,6 @@ topology_template:
             get_input:
             - pd_server_ips
             - 0
-        subnetpoolid:
-          get_input: port_pd_server_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pd_server_port_1_mac_requirements
         subinterface_indicator: false
@@ -145,8 +159,6 @@ topology_template:
           get_input: port_pd_server_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pd_server_port_1_network_role_tag
-        network:
-          get_input: net
         order:
           get_input: port_pd_server_port_1_order
       requirements:
@@ -157,6 +169,12 @@ topology_template:
     pd_server_port_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pd_server_port_2_subnetpoolid
+        related_networks:
+          get_input: port_pd_server_port_2_related_networks
+        network:
+          get_input: net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_pd_server_port_2_ip_requirements
@@ -167,8 +185,6 @@ topology_template:
             get_input:
             - pd_server_ips
             - 1
-        subnetpoolid:
-          get_input: port_pd_server_port_2_subnetpoolid
         mac_requirements:
           get_input: port_pd_server_port_2_mac_requirements
         subinterface_indicator: false
@@ -178,8 +194,6 @@ topology_template:
           get_input: port_pd_server_port_2_vlan_requirements
         network_role_tag:
           get_input: port_pd_server_port_2_network_role_tag
-        network:
-          get_input: net
         order:
           get_input: port_pd_server_port_2_order
       requirements:
@@ -430,4 +444,4 @@ topology_template:
       - dependency
       dependency_pd_server_port_2:
       - pd_server_port_2
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 411b35e..1701b99 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -30,6 +30,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cmaui_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1213,4 +1219,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml
index 9825e92..b0417f7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cmaui_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_ip_requirements
+        related_networks:
+          get_input: port_cmaui_port_related_networks
         network_role_tag:
           get_input: port_cmaui_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       local_storage_cmaui:
       - cmaui
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0a48717..2c58916 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -30,6 +30,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cmaui_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1163,4 +1169,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml
index 9825e92..b0417f7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cmaui_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_ip_requirements
+        related_networks:
+          get_input: port_cmaui_port_related_networks
         network_role_tag:
           get_input: port_cmaui_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       local_storage_cmaui:
       - cmaui
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5448c1e..01d7399 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -86,6 +86,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -1238,6 +1244,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_ps_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -1611,4 +1623,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml
index 831d03d..ebbbef8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml
@@ -74,6 +74,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_port_related_networks
         network_role_tag:
           get_input: port_pd_server_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       dependency_pd_server_pd_server_port:
       - pd_server_pd_server_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml
index 86d5f45..962695b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml
@@ -52,6 +52,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_ps_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_port_related_networks
         network_role_tag:
           get_input: port_ps_server_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 49d43a3..b7d9b88 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -86,6 +86,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -1997,6 +2003,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_server_port_fixed_ips:
         type: list
         required: true
@@ -2460,6 +2472,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_sm_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
     - dependency_sm_server:
         capability: tosca.capabilities.Node
@@ -2855,6 +2873,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_ps_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -3228,4 +3252,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
index 9287c9a..a332abf 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml
@@ -48,6 +48,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_oam_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_oam_server_port_fixed_ips:
       type: list
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_oam_server_port_ip_requirements
+        related_networks:
+          get_input: port_oam_server_port_related_networks
         network_role_tag:
           get_input: port_oam_server_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       link_oam_server_oam_server_port:
       - oam_server_oam_server_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
index 831d03d..ebbbef8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml
@@ -74,6 +74,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_port_related_networks
         network_role_tag:
           get_input: port_pd_server_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       dependency_pd_server_pd_server_port:
       - pd_server_pd_server_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
index 86d5f45..962695b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml
@@ -52,6 +52,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_ps_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -96,6 +101,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_port_related_networks
         network_role_tag:
           get_input: port_ps_server_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
index 502ee9b..061fd2e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml
@@ -77,6 +77,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_sm_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
   node_templates:
     sm_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.sm_server
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_sm_server_port_ip_requirements
+        related_networks:
+          get_input: port_sm_server_port_related_networks
         network_role_tag:
           get_input: port_sm_server_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - local_storage
       link_sm_server_sm_server_port:
       - sm_server_sm_server_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0d456cd..1d03026 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -92,6 +92,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -2009,6 +2015,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_server_port_fixed_ips:
         type: list
         required: true
@@ -2472,6 +2484,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_sm_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_sm_server_port_security_groups:
         type: list
         required: true
@@ -2879,6 +2897,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_ps_server_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -3252,4 +3276,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml
index b47f6e9..fad2bc2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml
@@ -53,6 +53,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_oam_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_oam_server_port_fixed_ips:
       type: list
       required: true
@@ -118,6 +123,8 @@ topology_template:
         vlan_requirements:
           get_input: port_oam_server_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_oam_server_port_related_networks
         ip_requirements:
           get_input: port_oam_server_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - dependency
       link_oam_server_oam_server_port:
       - oam_server_oam_server_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml
index 3130f3c..b38ff0b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml
@@ -79,6 +79,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -118,6 +123,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd_server_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd_server_port_related_networks
         ip_requirements:
           get_input: port_pd_server_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - link
       dependency_pd_server_pd_server_port:
       - pd_server_pd_server_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml
index a8789f3..ebdd539 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml
@@ -57,6 +57,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_ps_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -103,6 +108,8 @@ topology_template:
         vlan_requirements:
           get_input: port_ps_server_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_ps_server_port_related_networks
         ip_requirements:
           get_input: port_ps_server_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - link
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml
index 22ec89c..e342b87 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml
@@ -77,6 +77,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_sm_server_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_sm_server_port_security_groups:
       type: list
       required: true
@@ -118,6 +123,8 @@ topology_template:
         vlan_requirements:
           get_input: port_sm_server_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_sm_server_port_related_networks
         ip_requirements:
           get_input: port_sm_server_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - local_storage
       link_sm_server_sm_server_port:
       - sm_server_sm_server_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 462cd25..6f5c2c3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -46,6 +46,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_12_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_12_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -135,6 +141,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_02_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_12_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -579,6 +591,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -611,6 +629,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -1441,4 +1465,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 1fb93b4..28e33ef 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -40,6 +45,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -149,6 +159,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -158,8 +174,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -169,8 +183,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -194,6 +206,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -203,8 +221,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -214,8 +230,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -453,4 +467,4 @@ topology_template:
       - dependency
       local_storage_server_pcm_1:
       - server_pcm_1
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index 2055eaa..6c048bb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -45,6 +45,11 @@ topology_template:
     port_pcm_port_02_network_role_tag:
       type: string
       required: true
+    port_pcm_port_12_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_12_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -137,6 +142,11 @@ topology_template:
     port_pcm_port_12_network_role_tag:
       type: string
       required: true
+    port_pcm_port_02_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_12_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -162,6 +172,12 @@ topology_template:
     pcm_port_12:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_12_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_12_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_12_ip_requirements
         security_groups:
@@ -171,8 +187,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_12_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_12_mac_requirements
         subinterface_indicator: false
@@ -182,8 +196,6 @@ topology_template:
           get_input: port_pcm_port_12_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_12_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_12_order
       requirements:
@@ -194,6 +206,12 @@ topology_template:
     pcm_port_02:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_02_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_02_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_02_ip_requirements
         security_groups:
@@ -203,8 +221,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_02_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_02_mac_requirements
         subinterface_indicator: false
@@ -214,8 +230,6 @@ topology_template:
           get_input: port_pcm_port_02_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_02_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_02_order
       requirements:
@@ -453,4 +467,4 @@ topology_template:
       - dependency
       link_pcm_port_02:
       - pcm_port_02
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 258642e..9172dc4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -24,6 +24,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_cdi_ims_core_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -172,6 +178,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_cdi_internal_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cdi_ims_core_0_port_allowed_address_pairs:
         type: list
         required: true
@@ -621,12 +633,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.lbd:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_lbd_internal_1_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       port_lbd_ims_core_1_port_allowed_address_pairs:
         type: list
         required: true
@@ -639,12 +645,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_lbd_config_drive:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_lbd_internal_1_port_name:
         type: list
         required: true
@@ -657,22 +657,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
-      port_lbd_ims_core_1_port_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_lbd_ims_core_1_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_lbd_dpdk_1_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
       port_lbd_dpdk_1_port_subnetpoolid:
         type: string
         required: true
@@ -703,22 +687,6 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_lbd_internal_1_port_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_lbd_internal_1_port_security_groups:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_lbd_ims_core_1_port_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vm_image_name:
         type: string
         required: true
@@ -751,6 +719,98 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_lbd_ims_core_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      compute_lbd_scheduler_hints:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_lbd_dpdk_1_port_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_lbd_ims_core_1_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_lbd_internal_1_port_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_lbd_internal_1_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      compute_lbd_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_lbd_ims_core_1_port_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_lbd_internal_1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_lbd_config_drive:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: boolean
+      port_lbd_ims_core_1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_lbd_ims_core_1_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_lbd_dpdk_1_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_lbd_internal_1_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_lbd_internal_1_port_security_groups:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_lbd_ims_core_1_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_lbd_internal_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_lbd_internal_1_port_subnetpoolid:
         type: string
         required: true
@@ -791,18 +851,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      compute_lbd_scheduler_hints:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      port_lbd_dpdk_1_port_name:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       port_lbd_dpdk_1_port_security_groups:
         type: list
         required: true
@@ -815,16 +863,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_lbd_ims_core_1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_lbd_internal_1_port_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       port_lbd_internal_1_port_network_role:
         type: string
         required: true
@@ -841,26 +879,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_lbd_internal_1_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
       port_lbd_dpdk_1_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      compute_lbd_name:
+      port_lbd_dpdk_1_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_lbd_ims_core_1_port_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_lbd_dpdk_1_port_network_role:
         type: string
         required: true
@@ -1382,6 +1412,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_internal_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_internal_1_port_security_groups:
         type: list
         required: true
@@ -1444,6 +1480,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_oam_oam_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_internal_1_port_vlan_requirements:
         type: list
         required: true
@@ -1995,6 +2037,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_oam_2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_oam_2_port_security_groups:
         type: list
         required: true
@@ -2139,6 +2187,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_oam_internal_2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_oam_scheduler_hints:
         type: list
         required: true
@@ -2641,6 +2695,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_tdcore_dpdk_0_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_tdcore_internal_0_port_0_vlan_requirements:
         type: list
         required: true
@@ -2708,6 +2768,12 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
+      port_tdcore_internal_0_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       tdcore_flavor_name:
         type: string
         description: flavor name
@@ -3272,6 +3338,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_cdi_internal_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -3424,6 +3496,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_cdi_ims_core_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_cdi_metadata:
         type: list
         required: true
@@ -3881,18 +3959,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_lbd_config_drive:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
-      port_lbd_dpdk_0_port_fixed_ips:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
       port_lbd_internal_0_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -3905,22 +3971,16 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_lbd_internal_0_port_security_groups:
+      port_lbd_dpdk_0_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_lbd_dpdk_0_port_security_groups:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
       compute_lbd_availability_zone:
         type: list
         required: true
@@ -3937,184 +3997,220 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_lbd_dpdk_0_port_vlan_requirements:
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_lbd_dpdk_0_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      vm_image_name:
-        type: string
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_lbd_ims_core_0_port_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_lbd_dpdk_0_port_name:
+      port_lbd_ims_core_0_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_lbd_internal_0_port_subnetpoolid:
-        type: string
+      port_lbd_ims_core_0_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_lbd_dpdk_0_port_ip_requirements:
+      port_lbd_ims_core_0_port_allowed_address_pairs:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_lbd_ims_core_0_port_order:
-        type: integer
+          type: org.openecomp.datatypes.heat.network.AddressPair
+      port_lbd_internal_0_port_name:
+        type: list
         required: true
         status: SUPPORTED
-      port_lbd_ims_core_0_port_network_role:
+        entry_schema:
+          type: string
+      port_lbd_ims_core_0_port_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_lbd_ims_core_0_port_network:
+      port_lbd_ims_core_0_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_lbd_dpdk_0_port_network:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      compute_lbd_scheduler_hints:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_lbd_dpdk_0_port_network_role_tag:
-        type: string
+          type: json
+      port_lbd_internal_0_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_lbd_ims_core_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_lbd_dpdk_0_port_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_lbd_ims_core_0_port_allowed_address_pairs:
+      port_lbd_ims_core_0_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.network.AddressPair
-      port_lbd_internal_0_port_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_lbd_internal_0_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_lbd_internal_0_port_order:
-        type: integer
+      port_lbd_dpdk_0_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_lbd_dpdk_0_port_network_role:
-        type: string
+      compute_lbd_name:
+        type: list
         required: true
         status: SUPPORTED
-      port_lbd_ims_core_0_port_vlan_requirements:
+        entry_schema:
+          type: string
+      port_lbd_ims_core_0_port_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_lbd_ims_core_0_port_subnetpoolid:
-        type: string
+          type: json
+      port_lbd_ims_core_0_port_name:
+        type: list
         required: true
         status: SUPPORTED
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_lbd_ims_core_0_port_network_role_tag:
-        type: string
+        entry_schema:
+          type: string
+      port_lbd_internal_0_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      compute_lbd_scheduler_hints:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_lbd_config_drive:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_lbd_internal_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: boolean
+      port_lbd_internal_0_port_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_lbd_ims_core_0_port_fixed_ips:
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_lbd_dpdk_0_port_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_lbd_dpdk_0_port_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_lbd_ims_core_0_port_ip_requirements:
+      port_lbd_internal_0_port_security_groups:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_lbd_ims_core_0_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+          type: json
+      port_lbd_dpdk_0_port_security_groups:
+        type: list
         required: true
         status: SUPPORTED
-      port_lbd_internal_0_port_fixed_ips:
+        entry_schema:
+          type: json
+      port_lbd_dpdk_0_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_lbd_internal_0_port_network:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_lbd_dpdk_0_port_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_lbd_dpdk_0_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_lbd_internal_0_port_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      compute_lbd_metadata:
+      port_lbd_ims_core_0_port_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_lbd_dpdk_0_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      compute_lbd_name:
+          type: string
+      port_lbd_dpdk_0_port_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_lbd_internal_0_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_lbd_dpdk_0_port_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_lbd_ims_core_0_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_lbd_internal_0_port_ip_requirements:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_lbd_ims_core_0_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_lbd_ims_core_0_port_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_lbd_ims_core_0_port_security_groups:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_lbd_ims_core_0_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_lbd_internal_0_port_fixed_ips:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_lbd_ims_core_0_port_name:
+          type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      compute_lbd_metadata:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_lbd_internal_0_port_vlan_requirements:
+          type: json
+      port_lbd_internal_0_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
     requirements:
     - dependency_lbd_lbd_ims_core_0_port:
         capability: tosca.capabilities.Node
@@ -4668,6 +4764,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_cif_oam_1_port_3_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
@@ -4734,6 +4836,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_cif_ims_core_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_ims_li_1_port_allowed_address_pairs:
         type: list
         required: true
@@ -4780,6 +4888,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_cif_internal_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_oam_1_port_1_fixed_ips:
         type: list
         required: true
@@ -4942,6 +5056,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cif_oam_1_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_ims_core_1_port_subnetpoolid:
         type: string
         required: true
@@ -4982,6 +5102,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cif_ims_li_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_ims_li_1_port_network_role_tag:
         type: string
         required: true
@@ -5769,6 +5895,12 @@ node_types:
         description: Unique ID for this VF instance
         required: true
         status: SUPPORTED
+      port_cscf_internal_0_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       availability_zone_0:
         type: string
         description: Availability zone name for CSCF instances.
@@ -6265,6 +6397,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_oam_internal_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_image_name:
         type: string
         required: true
@@ -6323,6 +6461,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_oam_oam_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       compute_oam_user_data_format:
         type: list
         required: true
@@ -6864,6 +7008,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_tdcore_dpdk_0_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_tdcore_internal_0_port_0_vlan_requirements:
         type: list
         required: true
@@ -6931,6 +7081,12 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
+      port_tdcore_internal_0_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       tdcore_flavor_name:
         type: string
         description: flavor name
@@ -7491,6 +7647,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+      port_cif_internal_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_ims_li_0_port_network_role:
         type: string
         required: true
@@ -7523,6 +7685,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_cif_oam_0_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_oam_0_port_3_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -7543,6 +7711,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_cif_ims_core_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_oam_0_port_1_vlan_requirements:
         type: list
         required: true
@@ -7635,6 +7809,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_cif_oam_0_port_3_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_oam_0_port_1_subnetpoolid:
         type: string
         required: true
@@ -7765,6 +7945,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_cif_ims_li_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cif_internal_0_port_security_groups:
         type: list
         required: true
@@ -8605,6 +8791,12 @@ node_types:
         description: Unique ID for this VF instance
         required: true
         status: SUPPORTED
+      port_cscf_internal_0_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       availability_zone_0:
         type: string
         description: Availability zone name for CSCF instances.
@@ -9035,4 +9227,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml
index 1f76f3e..992afcd 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml
@@ -2488,8 +2488,6 @@ topology_template:
             get_input: lbd_ims_core_v6_vip_0
         compute_lbd_user_data_format:
         - RAW
-        compute_lbd_config_drive:
-        - true
         port_lbd_internal_1_port_name:
         - str_replace:
             template: $PREFIX$DELeth0
@@ -2503,15 +2501,6 @@ topology_template:
         - ip_address: 128.0.0.0/1
         - ip_address: ::/1
         - ip_address: 8000::/1
-        port_lbd_ims_core_1_port_ip_requirements:
-        - ip_version: 6
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_lbd_dpdk_1_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_input: lbd_flavor_name
         port_lbd_ims_core_1_port_mac_requirements:
@@ -2519,14 +2508,6 @@ topology_template:
             is_required: false
         compute_lbd_availability_zone:
         - get_input: availability_zone_1
-        port_lbd_internal_1_port_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_lbd_internal_1_port_security_groups:
-        - - cscf_RSG
         vm_image_name:
           get_input: lbd_image_name
         port_lbd_dpdk_1_port_network:
@@ -2539,16 +2520,6 @@ topology_template:
                 get_input: lbd_name_1
               $DEL:
                 get_input: vcscf_name_delimeter
-        port_lbd_ims_core_1_port_security_groups:
-        - - cscf_RSG
-        port_lbd_ims_core_1_port_fixed_ips:
-        - ip_address:
-            get_input: lbd_ims_core_v6_ip_1
-        port_lbd_internal_1_port_fixed_ips:
-        - ip_address:
-            get_input: lbd_internal_ip_1
-        port_lbd_ims_core_1_port_network:
-        - get_input: ims_core_net_id
         compute_lbd_scheduler_hints:
         - group: lbd_server_group_group
         port_lbd_dpdk_1_port_name:
@@ -2559,13 +2530,48 @@ topology_template:
                 get_input: lbd_name_1
               $DEL:
                 get_input: vcscf_name_delimeter
+        port_lbd_internal_1_port_network:
+        - cscf_internal_network_0
+        port_lbd_internal_1_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        compute_lbd_name:
+        - get_input: lbd_name_1
+        port_lbd_ims_core_1_port_network_role_tag: ims_core
+        compute_lbd_config_drive:
+        - true
+        port_lbd_ims_core_1_port_ip_requirements:
+        - ip_version: 6
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_lbd_dpdk_1_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_lbd_internal_1_port_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_lbd_internal_1_port_security_groups:
+        - - cscf_RSG
+        port_lbd_ims_core_1_port_security_groups:
+        - - cscf_RSG
+        port_lbd_ims_core_1_port_fixed_ips:
+        - ip_address:
+            get_input: lbd_ims_core_v6_ip_1
+        port_lbd_internal_1_port_fixed_ips:
+        - ip_address:
+            get_input: lbd_internal_ip_1
+        port_lbd_ims_core_1_port_network:
+        - get_input: ims_core_net_id
         port_lbd_dpdk_1_port_security_groups:
         - - cscf_RSG
         port_lbd_dpdk_1_port_fixed_ips:
         - ip_address:
             get_input: lbd_internal_dpdk_ip_1
-        port_lbd_internal_1_port_network:
-        - cscf_internal_network_0
         port_lbd_dpdk_1_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -2582,12 +2588,6 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        port_lbd_internal_1_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        compute_lbd_name:
-        - get_input: lbd_name_1
-        port_lbd_ims_core_1_port_network_role_tag: ims_core
         service_template_filter:
           substitute_service_template: Nested_lbdServiceTemplate.yaml
           count: 1
@@ -3276,17 +3276,8 @@ topology_template:
       properties:
         compute_lbd_user_data_format:
         - RAW
-        compute_lbd_config_drive:
-        - true
-        port_lbd_dpdk_0_port_fixed_ips:
-        - ip_address:
-            get_input: lbd_internal_dpdk_ip_0
-        port_lbd_internal_0_port_security_groups:
-        - - cscf_RSG
         vm_flavor_name:
           get_input: lbd_flavor_name
-        port_lbd_dpdk_0_port_security_groups:
-        - - cscf_RSG
         compute_lbd_availability_zone:
         - get_input: availability_zone_0
         port_lbd_dpdk_0_port_allowed_address_pairs:
@@ -3296,14 +3287,6 @@ topology_template:
         - ip_address: 8000::/1
         vm_image_name:
           get_input: lbd_image_name
-        port_lbd_dpdk_0_port_name:
-        - str_replace:
-            template: $PREFIX$DELeth1
-            params:
-              $PREFIX:
-                get_input: lbd_name_0
-              $DEL:
-                get_input: vcscf_name_delimeter
         port_lbd_dpdk_0_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -3312,8 +3295,6 @@ topology_template:
             is_required: false
         port_lbd_ims_core_0_port_network:
         - get_input: ims_core_net_id
-        port_lbd_dpdk_0_port_network:
-        - cscf_internal_dpdk_network_0
         port_lbd_ims_core_0_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -3334,23 +3315,54 @@ topology_template:
         port_lbd_internal_0_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_lbd_ims_core_0_port_fixed_ips:
-        - ip_address:
-            get_input: lbd_ims_core_v6_ip_0
         port_lbd_ims_core_0_port_ip_requirements:
         - ip_version: 6
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_lbd_internal_0_port_fixed_ips:
-        - ip_address:
-            get_input: lbd_internal_ip_0
         port_lbd_internal_0_port_network:
         - cscf_internal_network_0
         port_lbd_dpdk_0_port_mac_requirements:
           mac_count_required:
             is_required: false
+        compute_lbd_name:
+        - get_input: lbd_name_0
+        port_lbd_ims_core_0_port_security_groups:
+        - - cscf_RSG
+        port_lbd_ims_core_0_port_name:
+        - str_replace:
+            template: $PREFIX$DELeth2
+            params:
+              $PREFIX:
+                get_input: lbd_name_0
+              $DEL:
+                get_input: vcscf_name_delimeter
+        compute_lbd_config_drive:
+        - true
+        port_lbd_dpdk_0_port_fixed_ips:
+        - ip_address:
+            get_input: lbd_internal_dpdk_ip_0
+        port_lbd_internal_0_port_security_groups:
+        - - cscf_RSG
+        port_lbd_dpdk_0_port_security_groups:
+        - - cscf_RSG
+        port_lbd_dpdk_0_port_name:
+        - str_replace:
+            template: $PREFIX$DELeth1
+            params:
+              $PREFIX:
+                get_input: lbd_name_0
+              $DEL:
+                get_input: vcscf_name_delimeter
+        port_lbd_dpdk_0_port_network:
+        - cscf_internal_dpdk_network_0
+        port_lbd_ims_core_0_port_fixed_ips:
+        - ip_address:
+            get_input: lbd_ims_core_v6_ip_0
+        port_lbd_internal_0_port_fixed_ips:
+        - ip_address:
+            get_input: lbd_internal_ip_0
         compute_lbd_metadata:
         - vf_module_id:
             get_input: vf_module_id
@@ -3361,24 +3373,12 @@ topology_template:
             get_input: vnf_name
           vf_module_name:
             get_input: vf_module_name
-        compute_lbd_name:
-        - get_input: lbd_name_0
         port_lbd_internal_0_port_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_lbd_ims_core_0_port_security_groups:
-        - - cscf_RSG
-        port_lbd_ims_core_0_port_name:
-        - str_replace:
-            template: $PREFIX$DELeth2
-            params:
-              $PREFIX:
-                get_input: lbd_name_0
-              $DEL:
-                get_input: vcscf_name_delimeter
         service_template_filter:
           substitute_service_template: Nested_lbd_1ServiceTemplate.yaml
           count: 1

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml
index 37354cf..e41c99a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml
@@ -24,6 +24,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_cdi_ims_core_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -144,6 +149,11 @@ topology_template:
     port_cdi_internal_0_port_order:
       type: integer
       required: true
+    port_cdi_internal_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cdi_ims_core_0_port_allowed_address_pairs:
       type: list
       required: true
@@ -179,6 +189,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cdi_ims_core_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cdi_ims_core_0_port_related_networks
         ip_requirements:
           get_input: port_cdi_ims_core_0_port_ip_requirements
         network_role_tag:
@@ -253,6 +265,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cdi_internal_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cdi_internal_0_port_related_networks
         ip_requirements:
           get_input: port_cdi_internal_0_port_ip_requirements
         network_role_tag:
@@ -494,4 +508,4 @@ topology_template:
       - dependency
       dependency_cdi_cdi_internal_0_port:
       - cdi_cdi_internal_0_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml
index 1e53668..d6d9cfe 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml
@@ -22,6 +22,11 @@ topology_template:
     port_cdi_internal_1_port_network_role_tag:
       type: string
       required: true
+    port_cdi_internal_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -146,6 +151,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_cdi_ims_core_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_cdi_metadata:
       type: list
       required: true
@@ -179,6 +189,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cdi_internal_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cdi_internal_1_port_related_networks
         ip_requirements:
           get_input: port_cdi_internal_1_port_ip_requirements
         network_role_tag:
@@ -253,6 +265,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cdi_ims_core_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cdi_ims_core_1_port_related_networks
         ip_requirements:
           get_input: port_cdi_ims_core_1_port_ip_requirements
         network_role_tag:
@@ -494,4 +508,4 @@ topology_template:
       - dependency
       dependency_cdi:
       - cdi
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml
index 4f95a1d..56fd1de 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_cif_internal_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cif_ims_li_0_port_network_role:
       type: string
       required: true
@@ -56,6 +61,11 @@ topology_template:
     port_cif_oam_0_port_1_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_cif_oam_0_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cif_oam_0_port_3_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -72,6 +82,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_cif_ims_core_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cif_oam_0_port_1_vlan_requirements:
       type: list
       required: true
@@ -146,6 +161,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_cif_oam_0_port_3_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cif_oam_0_port_1_subnetpoolid:
       type: string
       required: true
@@ -250,6 +270,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cif_ims_li_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cif_internal_0_port_security_groups:
       type: list
       required: true
@@ -369,6 +394,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cif_internal_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cif_internal_0_port_related_networks
         ip_requirements:
           get_input: port_cif_internal_0_port_ip_requirements
         network_role_tag:
@@ -412,6 +439,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cif_ims_li_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cif_ims_li_0_port_related_networks
         ip_requirements:
           get_input: port_cif_ims_li_0_port_ip_requirements
         network_role_tag:
@@ -455,6 +484,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cif_ims_core_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cif_ims_core_0_port_related_networks
         ip_requirements:
           get_input: port_cif_ims_core_0_port_ip_requirements
         network_role_tag:
@@ -498,6 +529,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cif_oam_0_port_1_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cif_oam_0_port_1_related_networks
         ip_requirements:
           get_input: port_cif_oam_0_port_1_ip_requirements
         network_role_tag:
@@ -541,6 +574,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cif_oam_0_port_3_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cif_oam_0_port_3_related_networks
         ip_requirements:
           get_input: port_cif_oam_0_port_3_ip_requirements
         network_role_tag:
@@ -908,4 +943,4 @@ topology_template:
       - link
       link_cif_cif_oam_0_port_3:
       - cif_cif_oam_0_port_3
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml
index 0e02d66..ae63110 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml
@@ -43,6 +43,11 @@ topology_template:
     port_cif_oam_1_port_3_subnetpoolid:
       type: string
       required: true
+    port_cif_oam_1_port_3_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
@@ -96,6 +101,11 @@ topology_template:
     port_cif_ims_li_1_port_subnetpoolid:
       type: string
       required: true
+    port_cif_ims_core_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cif_ims_li_1_port_allowed_address_pairs:
       type: list
       required: true
@@ -133,6 +143,11 @@ topology_template:
     port_cif_internal_1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_cif_internal_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cif_oam_1_port_1_fixed_ips:
       type: list
       required: true
@@ -264,6 +279,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cif_oam_1_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cif_ims_core_1_port_subnetpoolid:
       type: string
       required: true
@@ -297,6 +317,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_cif_ims_li_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cif_ims_li_1_port_network_role_tag:
       type: string
       required: true
@@ -369,6 +394,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cif_ims_li_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cif_ims_li_1_port_related_networks
         ip_requirements:
           get_input: port_cif_ims_li_1_port_ip_requirements
         network_role_tag:
@@ -412,6 +439,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cif_internal_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cif_internal_1_port_related_networks
         ip_requirements:
           get_input: port_cif_internal_1_port_ip_requirements
         network_role_tag:
@@ -455,6 +484,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cif_oam_1_port_1_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cif_oam_1_port_1_related_networks
         ip_requirements:
           get_input: port_cif_oam_1_port_1_ip_requirements
         network_role_tag:
@@ -498,6 +529,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cif_ims_core_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cif_ims_core_1_port_related_networks
         ip_requirements:
           get_input: port_cif_ims_core_1_port_ip_requirements
         network_role_tag:
@@ -541,6 +574,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cif_oam_1_port_3_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cif_oam_1_port_3_related_networks
         ip_requirements:
           get_input: port_cif_oam_1_port_3_ip_requirements
         network_role_tag:
@@ -908,4 +943,4 @@ topology_template:
       - link
       link_cif_cif_oam_1_port_3:
       - cif_cif_oam_1_port_3
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml
index 40d031a..4724e88 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_lbd_internal_1_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_lbd_ims_core_1_port_allowed_address_pairs:
       type: list
       required: true
@@ -26,11 +21,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    compute_lbd_config_drive:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_lbd_internal_1_port_name:
       type: list
       required: true
@@ -41,19 +31,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.network.AddressPair
-    port_lbd_ims_core_1_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_lbd_ims_core_1_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_lbd_dpdk_1_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_lbd_dpdk_1_port_subnetpoolid:
       type: string
       required: true
@@ -77,19 +54,6 @@ topology_template:
     port_lbd_internal_1_port_order:
       type: integer
       required: true
-    port_lbd_internal_1_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_lbd_internal_1_port_security_groups:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    port_lbd_ims_core_1_port_subnetpoolid:
-      type: string
-      required: true
     vm_image_name:
       type: string
       required: true
@@ -115,6 +79,81 @@ topology_template:
     port_lbd_ims_core_1_port_network_role:
       type: string
       required: true
+    port_lbd_ims_core_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    compute_lbd_scheduler_hints:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_lbd_dpdk_1_port_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_lbd_ims_core_1_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_lbd_internal_1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_lbd_internal_1_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    compute_lbd_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_lbd_ims_core_1_port_network_role_tag:
+      type: string
+      required: true
+    port_lbd_internal_1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_lbd_config_drive:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
+    port_lbd_ims_core_1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_lbd_ims_core_1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_lbd_dpdk_1_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_lbd_internal_1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_lbd_internal_1_port_security_groups:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_lbd_ims_core_1_port_subnetpoolid:
+      type: string
+      required: true
+    port_lbd_internal_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_lbd_internal_1_port_subnetpoolid:
       type: string
       required: true
@@ -148,16 +187,6 @@ topology_template:
     port_lbd_dpdk_1_port_network_role_tag:
       type: string
       required: true
-    compute_lbd_scheduler_hints:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    port_lbd_dpdk_1_port_name:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     port_lbd_dpdk_1_port_security_groups:
       type: list
       required: true
@@ -168,14 +197,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_lbd_ims_core_1_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_lbd_internal_1_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     port_lbd_internal_1_port_network_role:
       type: string
       required: true
@@ -189,22 +210,16 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_lbd_internal_1_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_lbd_dpdk_1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    compute_lbd_name:
+    port_lbd_dpdk_1_port_related_networks:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_lbd_ims_core_1_port_network_role_tag:
-      type: string
-      required: true
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_lbd_dpdk_1_port_network_role:
       type: string
       required: true
@@ -227,6 +242,8 @@ topology_template:
         vlan_requirements:
           get_input: port_lbd_ims_core_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_lbd_ims_core_1_port_related_networks
         ip_requirements:
           get_input: port_lbd_ims_core_1_port_ip_requirements
         network_role_tag:
@@ -270,6 +287,8 @@ topology_template:
         vlan_requirements:
           get_input: port_lbd_dpdk_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_lbd_dpdk_1_port_related_networks
         ip_requirements:
           get_input: port_lbd_dpdk_1_port_ip_requirements
         network_role_tag:
@@ -311,6 +330,8 @@ topology_template:
         vlan_requirements:
           get_input: port_lbd_internal_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_lbd_internal_1_port_related_networks
         ip_requirements:
           get_input: port_lbd_internal_1_port_ip_requirements
         network_role_tag:
@@ -625,4 +646,4 @@ topology_template:
       - link
       dependency_lbd_lbd_dpdk_1_port:
       - lbd_lbd_dpdk_1_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml
index 6cf9d09..52f88a0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml
@@ -19,16 +19,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    compute_lbd_config_drive:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
-    port_lbd_dpdk_0_port_fixed_ips:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     port_lbd_internal_0_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -38,19 +28,14 @@ topology_template:
     port_lbd_internal_0_port_network_role:
       type: string
       required: true
-    port_lbd_internal_0_port_security_groups:
+    port_lbd_dpdk_0_port_related_networks:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
-    port_lbd_dpdk_0_port_security_groups:
-      type: list
-      required: true
-      entry_schema:
-        type: json
     compute_lbd_availability_zone:
       type: list
       required: true
@@ -64,22 +49,9 @@ topology_template:
     port_lbd_dpdk_0_port_subnetpoolid:
       type: string
       required: true
-    port_lbd_dpdk_0_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     vm_image_name:
       type: string
       required: true
-    port_lbd_dpdk_0_port_name:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_lbd_internal_0_port_subnetpoolid:
-      type: string
-      required: true
     port_lbd_dpdk_0_port_ip_requirements:
       type: list
       required: true
@@ -88,22 +60,11 @@ topology_template:
     port_lbd_ims_core_0_port_order:
       type: integer
       required: true
-    port_lbd_ims_core_0_port_network_role:
-      type: string
-      required: true
     port_lbd_ims_core_0_port_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_lbd_dpdk_0_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_lbd_dpdk_0_port_network_role_tag:
-      type: string
-      required: true
     port_lbd_ims_core_0_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -117,30 +78,14 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_lbd_internal_0_port_order:
-      type: integer
-      required: true
-    port_lbd_dpdk_0_port_network_role:
+    port_lbd_ims_core_0_port_network_role_tag:
       type: string
       required: true
-    port_lbd_ims_core_0_port_vlan_requirements:
+    port_lbd_ims_core_0_port_related_networks:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_lbd_ims_core_0_port_subnetpoolid:
-      type: string
-      required: true
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    port_lbd_ims_core_0_port_network_role_tag:
-      type: string
-      required: true
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_lbd_scheduler_hints:
       type: list
       required: true
@@ -149,11 +94,6 @@ topology_template:
     port_lbd_internal_0_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_lbd_ims_core_0_port_fixed_ips:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     port_lbd_dpdk_0_port_order:
       type: integer
       required: true
@@ -162,14 +102,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_lbd_ims_core_0_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_lbd_internal_0_port_fixed_ips:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     port_lbd_internal_0_port_network:
       type: list
       required: true
@@ -178,36 +110,119 @@ topology_template:
     port_lbd_dpdk_0_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    compute_lbd_metadata:
+    compute_lbd_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_lbd_ims_core_0_port_security_groups:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_lbd_name:
+    port_lbd_ims_core_0_port_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_lbd_internal_0_port_ip_requirements:
+    port_lbd_internal_0_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_lbd_ims_core_0_port_security_groups:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_lbd_config_drive:
+      type: list
+      required: true
+      entry_schema:
+        type: boolean
+    port_lbd_internal_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_lbd_dpdk_0_port_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_lbd_internal_0_port_security_groups:
       type: list
       required: true
       entry_schema:
         type: json
-    port_lbd_ims_core_0_port_name:
+    port_lbd_dpdk_0_port_security_groups:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_lbd_dpdk_0_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_lbd_dpdk_0_port_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_lbd_internal_0_port_vlan_requirements:
+    port_lbd_internal_0_port_subnetpoolid:
+      type: string
+      required: true
+    port_lbd_ims_core_0_port_network_role:
+      type: string
+      required: true
+    port_lbd_dpdk_0_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_lbd_dpdk_0_port_network_role_tag:
+      type: string
+      required: true
+    port_lbd_internal_0_port_order:
+      type: integer
+      required: true
+    port_lbd_dpdk_0_port_network_role:
+      type: string
+      required: true
+    port_lbd_ims_core_0_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_lbd_ims_core_0_port_subnetpoolid:
+      type: string
+      required: true
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_lbd_ims_core_0_port_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_lbd_ims_core_0_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_lbd_internal_0_port_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    compute_lbd_metadata:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_lbd_internal_0_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
   node_templates:
     lbd_lbd_ims_core_0_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -227,6 +242,8 @@ topology_template:
         vlan_requirements:
           get_input: port_lbd_ims_core_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_lbd_ims_core_0_port_related_networks
         ip_requirements:
           get_input: port_lbd_ims_core_0_port_ip_requirements
         network_role_tag:
@@ -270,6 +287,8 @@ topology_template:
         vlan_requirements:
           get_input: port_lbd_dpdk_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_lbd_dpdk_0_port_related_networks
         ip_requirements:
           get_input: port_lbd_dpdk_0_port_ip_requirements
         network_role_tag:
@@ -311,6 +330,8 @@ topology_template:
         vlan_requirements:
           get_input: port_lbd_internal_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_lbd_internal_0_port_related_networks
         ip_requirements:
           get_input: port_lbd_internal_0_port_ip_requirements
         network_role_tag:
@@ -625,4 +646,4 @@ topology_template:
       - link
       link_lbd_lbd_internal_0_port:
       - lbd_lbd_internal_0_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml
index 342b679..ea3d737 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml
@@ -51,6 +51,11 @@ topology_template:
     port_oam_oam_0_port_order:
       type: integer
       required: true
+    port_oam_internal_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_image_name:
       type: string
       required: true
@@ -98,6 +103,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_oam_oam_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_oam_user_data_format:
       type: list
       required: true
@@ -179,6 +189,8 @@ topology_template:
         vlan_requirements:
           get_input: port_oam_oam_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_oam_oam_0_port_related_networks
         ip_requirements:
           get_input: port_oam_oam_0_port_ip_requirements
         network_role_tag:
@@ -222,6 +234,8 @@ topology_template:
         vlan_requirements:
           get_input: port_oam_internal_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_oam_internal_0_port_related_networks
         ip_requirements:
           get_input: port_oam_internal_0_port_ip_requirements
         network_role_tag:
@@ -494,4 +508,4 @@ topology_template:
       - dependency
       link_oam_oam_internal_0_port:
       - oam_oam_internal_0_port
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml
index 1c727e5..ab18969 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_oam_internal_1_port_network_role_tag:
       type: string
       required: true
+    port_oam_internal_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_oam_internal_1_port_security_groups:
       type: list
       required: true
@@ -64,6 +69,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+    port_oam_oam_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_oam_internal_1_port_vlan_requirements:
       type: list
       required: true
@@ -179,6 +189,8 @@ topology_template:
         vlan_requirements:
           get_input: port_oam_internal_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_oam_internal_1_port_related_networks
         ip_requirements:
           get_input: port_oam_internal_1_port_ip_requirements
         network_role_tag:
@@ -222,6 +234,8 @@ topology_template:
         vlan_requirements:
           get_input: port_oam_oam_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_oam_oam_1_port_related_networks
         ip_requirements:
           get_input: port_oam_oam_1_port_ip_requirements
         network_role_tag:
@@ -494,4 +508,4 @@ topology_template:
       - dependency
       dependency_oam_oam_oam_1_port:
       - oam_oam_oam_1_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml
index 6d835ea..d099f16 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_oam_oam_2_port_network_role_tag:
       type: string
       required: true
+    port_oam_oam_2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_oam_oam_2_port_security_groups:
       type: list
       required: true
@@ -130,6 +135,11 @@ topology_template:
     port_oam_oam_2_port_order:
       type: integer
       required: true
+    port_oam_internal_2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     compute_oam_scheduler_hints:
       type: list
       required: true
@@ -179,6 +189,8 @@ topology_template:
         vlan_requirements:
           get_input: port_oam_internal_2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_oam_internal_2_port_related_networks
         ip_requirements:
           get_input: port_oam_internal_2_port_ip_requirements
         network_role_tag:
@@ -222,6 +234,8 @@ topology_template:
         vlan_requirements:
           get_input: port_oam_oam_2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_oam_oam_2_port_related_networks
         ip_requirements:
           get_input: port_oam_oam_2_port_ip_requirements
         network_role_tag:
@@ -494,4 +508,4 @@ topology_template:
       - dependency
       dependency_oam:
       - oam
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml
index 73d44bd..8432542 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml
@@ -86,6 +86,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique ID for this VF instance
+    port_cscf_internal_0_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     availability_zone_0:
       hidden: false
       immutable: false
@@ -213,6 +218,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_cscf_internal_0_port_0_subnetpoolid
+        related_networks:
+          get_input: port_cscf_internal_0_port_0_related_networks
         network:
           get_input: internal_net_id
         ip_requirements:
@@ -439,4 +446,4 @@ topology_template:
       - link
       local_storage_cscf_server_0:
       - cscf_server_0
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml
index e136294..54bb2f5 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml
@@ -46,6 +46,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_tdcore_dpdk_0_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_tdcore_internal_0_port_0_vlan_requirements:
       type: list
       required: true
@@ -106,6 +111,11 @@ topology_template:
     port_tdcore_dpdk_0_port_1_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
+    port_tdcore_internal_0_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     tdcore_flavor_name:
       hidden: false
       immutable: false
@@ -226,6 +236,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_tdcore_internal_0_port_0_subnetpoolid
+        related_networks:
+          get_input: port_tdcore_internal_0_port_0_related_networks
         network:
           get_input: internal_net_id
         ip_requirements:
@@ -275,6 +287,8 @@ topology_template:
         - ip_address: 128.0.0.0/1
         - ip_address: ::/1
         - ip_address: 8000::/1
+        related_networks:
+          get_input: port_tdcore_dpdk_0_port_1_related_networks
         network:
           get_input: internal_dpdk_net_id
         ip_requirements:
@@ -568,4 +582,4 @@ topology_template:
       - dependency
       local_storage_tdcore_server_0:
       - tdcore_server_0
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 120e1d7..cd1f543 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -75,6 +75,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -613,6 +619,12 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       default_gateway_v6:
         type: string
         description: Default IPv6 gateway.
@@ -1078,6 +1090,12 @@ node_types:
         description: Unique name for this VF module instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       dns_servers:
         type: list
         description: List of DNS servers.
@@ -1590,6 +1608,12 @@ node_types:
         description: Unique name for this VF module instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       dns_servers:
         type: list
         description: List of DNS servers.
@@ -2122,6 +2146,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -2591,6 +2621,12 @@ node_types:
         description: Unique name for this VF module instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       dns_servers:
         type: list
         description: List of DNS servers.
@@ -3097,6 +3133,12 @@ node_types:
         description: Unique name for this VF module instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       dns_servers:
         type: list
         description: List of DNS servers.
@@ -3603,6 +3645,12 @@ node_types:
         description: Unique name for this VF module instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       dns_servers:
         type: list
         description: List of DNS servers.
@@ -4227,6 +4275,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_20_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
@@ -4733,6 +4787,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_20_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
@@ -5150,6 +5210,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -5575,4 +5641,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
index 8e29ff8..01a0937 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
@@ -183,6 +183,11 @@ topology_template:
     port_vson_server_oam_net_port_20_order:
       type: integer
       required: true
+    port_vson_server_oam_net_port_20_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vson_vm_names:
       label: vSON Cluster leader names
       hidden: false
@@ -228,6 +233,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vson_server_oam_net_port_20_subnetpoolid
+        related_networks:
+          get_input: port_vson_server_oam_net_port_20_related_networks
         network:
           get_input: oam_net_id
         ip_requirements:
@@ -453,4 +460,4 @@ topology_template:
       - dependency
       dependency_vson_server_1:
       - vson_server_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
index 2814364..f6cc40a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
@@ -85,6 +85,11 @@ topology_template:
     port_vson_server_oam_net_port_10_subnetpoolid:
       type: string
       required: true
+    port_vson_server_oam_net_port_10_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vson_dc_unit:
       label: vSON Data Center name
       hidden: false
@@ -215,6 +220,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vson_server_oam_net_port_10_subnetpoolid
+        related_networks:
+          get_input: port_vson_server_oam_net_port_10_related_networks
         network:
           get_input: oam_net_id
         ip_requirements:
@@ -440,4 +447,4 @@ topology_template:
       - link
       dependency_vson_server_3:
       - vson_server_3
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
index 0ab6d2e..3f157c5 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
@@ -55,6 +55,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF module instance.
+    port_vson_server_oam_net_port_00_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     dns_servers:
       label: DNS servers
       hidden: false
@@ -230,6 +235,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vson_server_oam_net_port_00_subnetpoolid
+        related_networks:
+          get_input: port_vson_server_oam_net_port_00_related_networks
         network:
           get_input: oam_net_id
         ip_requirements:
@@ -455,4 +462,4 @@ topology_template:
       - link
       dependency_vson_server_2:
       - vson_server_2
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml
index 4f102dd..9c41db4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml
@@ -127,6 +127,11 @@ topology_template:
       type: string
       description: |
         Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
+    port_vson_server_oam_net_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     default_gateway_v6:
       label: Default IPv6 gateway
       hidden: false
@@ -250,6 +255,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vson_server_oam_net_port_0_subnetpoolid
+        related_networks:
+          get_input: port_vson_server_oam_net_port_0_related_networks
         network:
           get_input: oam_net_id
         ip_requirements:
@@ -479,4 +486,4 @@ topology_template:
       - dependency
       local_storage_vson_server:
       - vson_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 94ebe4d..26cf345 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -311,6 +311,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_cmaui_port_7_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_7_network_role_tag:
         type: string
         required: true
@@ -405,6 +411,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_cmaui_port_8_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     requirements:
     - dependency_cmaui_port_7:
         capability: tosca.capabilities.Node
@@ -834,6 +846,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.cmaui:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_cmaui_port_6_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_6_fixed_ips:
         type: list
         required: true
@@ -876,6 +894,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_cmaui_port_5_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_6_network:
         type: list
         required: true
@@ -1507,6 +1531,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
+      port_cmaui_port_3_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_3_ip_requirements:
         type: list
         required: true
@@ -1555,6 +1585,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_cmaui_port_4_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_4_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -3784,6 +3820,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_cmaui_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_1_security_groups:
         type: list
         required: true
@@ -3828,6 +3870,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_cmaui_port_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_cmaui_port_2_network_role_tag:
         type: string
         required: true
@@ -6608,4 +6656,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
index 8f42b61..0f5f943 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_cmaui_port_6_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cmaui_port_6_fixed_ips:
       type: list
       required: true
@@ -44,6 +49,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_cmaui_port_5_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cmaui_port_6_network:
       type: list
       required: true
@@ -151,6 +161,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cmaui_port_5_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cmaui_port_5_related_networks
         ip_requirements:
           get_input: port_cmaui_port_5_ip_requirements
         network_role_tag:
@@ -192,6 +204,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cmaui_port_6_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cmaui_port_6_related_networks
         ip_requirements:
           get_input: port_cmaui_port_6_ip_requirements
         network_role_tag:
@@ -444,4 +458,4 @@ topology_template:
       - dependency
       local_storage_cmaui:
       - cmaui
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
index 3407e72..a3290f4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
@@ -88,6 +88,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_cmaui_port_3_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cmaui_port_3_ip_requirements:
       type: list
       required: true
@@ -127,6 +132,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_cmaui_port_4_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cmaui_port_4_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -151,6 +161,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cmaui_port_4_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cmaui_port_4_related_networks
         ip_requirements:
           get_input: port_cmaui_port_4_ip_requirements
         network_role_tag:
@@ -192,6 +204,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cmaui_port_3_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cmaui_port_3_related_networks
         ip_requirements:
           get_input: port_cmaui_port_3_ip_requirements
         network_role_tag:
@@ -444,4 +458,4 @@ topology_template:
       - dependency
       local_storage_cmaui:
       - cmaui
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
index 08dd30a..63942e2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
@@ -20,6 +20,11 @@ topology_template:
     port_cmaui_port_1_subnetpoolid:
       type: string
       required: true
+    port_cmaui_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cmaui_port_1_security_groups:
       type: list
       required: true
@@ -55,6 +60,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_cmaui_port_2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cmaui_port_2_network_role_tag:
       type: string
       required: true
@@ -151,6 +161,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cmaui_port_1_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cmaui_port_1_related_networks
         ip_requirements:
           get_input: port_cmaui_port_1_ip_requirements
         network_role_tag:
@@ -192,6 +204,8 @@ topology_template:
         vlan_requirements:
           get_input: port_cmaui_port_2_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_cmaui_port_2_related_networks
         ip_requirements:
           get_input: port_cmaui_port_2_ip_requirements
         network_role_tag:
@@ -444,4 +458,4 @@ topology_template:
       - local_storage
       dependency_cmaui_cmaui_port_1:
       - cmaui_cmaui_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
index 17205b3..c819704 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
@@ -33,6 +33,11 @@ topology_template:
     port_cmaui_port_8_order:
       type: integer
       required: true
+    port_cmaui_port_7_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_cmaui_port_7_network_role_tag:
       type: string
       required: true
@@ -114,12 +119,19 @@ topology_template:
     port_cmaui_port_8_subnetpoolid:
       type: string
       required: true
+    port_cmaui_port_8_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
   node_templates:
     cmaui_port_7:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         subnetpoolid:
           get_input: port_cmaui_port_7_subnetpoolid
+        related_networks:
+          get_input: port_cmaui_port_7_related_networks
         network:
           get_input: net
         replacement_policy: AUTO
@@ -168,6 +180,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_cmaui_port_8_subnetpoolid
+        related_networks:
+          get_input: port_cmaui_port_8_related_networks
         network:
           get_input: net
         replacement_policy: AUTO
@@ -425,4 +439,4 @@ topology_template:
       - dependency
       local_storage_server_cmaui_4:
       - server_cmaui_4
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5872b05..adbfc2a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -26,6 +26,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_port_1_network_role_tag:
         type: string
         required: true
@@ -150,6 +156,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_oam_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       shared_security_group_id1:
         type: string
         description: UID of OAM network
@@ -589,6 +601,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -631,6 +649,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -1188,6 +1212,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_oam_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_oam_port_1_network_role_tag:
         type: string
         required: true
@@ -1312,6 +1342,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_oam_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       shared_security_group_id1:
         type: string
         description: UID of OAM network
@@ -1751,6 +1787,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -1793,6 +1835,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -2629,4 +2677,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 7948029..eb4cfb9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -28,6 +28,11 @@ topology_template:
     port_oam_port_0_network_role:
       type: string
       required: true
+    port_oam_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_oam_port_1_network_role_tag:
       type: string
       required: true
@@ -150,6 +155,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_oam_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     shared_security_group_id1:
       hidden: false
       immutable: false
@@ -159,6 +169,12 @@ topology_template:
     oam_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_oam_port_0_subnetpoolid
+        related_networks:
+          get_input: port_oam_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_oam_port_0_ip_requirements
         security_groups:
@@ -168,8 +184,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_oam_port_0_subnetpoolid
         mac_requirements:
           get_input: port_oam_port_0_mac_requirements
         subinterface_indicator: false
@@ -179,8 +193,6 @@ topology_template:
           get_input: port_oam_port_0_vlan_requirements
         network_role_tag:
           get_input: port_oam_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_oam_port_0_order
       requirements:
@@ -203,6 +215,12 @@ topology_template:
     oam_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_oam_port_1_subnetpoolid
+        related_networks:
+          get_input: port_oam_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_oam_port_1_ip_requirements
         security_groups:
@@ -213,8 +231,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_oam_port_1_subnetpoolid
         mac_requirements:
           get_input: port_oam_port_1_mac_requirements
         subinterface_indicator: false
@@ -224,8 +240,6 @@ topology_template:
           get_input: port_oam_port_1_vlan_requirements
         network_role_tag:
           get_input: port_oam_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_oam_port_1_order
       requirements:
@@ -463,4 +477,4 @@ topology_template:
       - link
       dependency_server_oam:
       - server_oam
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index 205114d..6107509 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -50,6 +55,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -159,6 +169,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -168,8 +184,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -179,8 +193,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -204,6 +216,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -214,8 +232,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -225,8 +241,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -464,4 +478,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bb77b07..8cf38b5 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -45,6 +51,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -655,6 +667,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
@@ -671,6 +689,12 @@ node_types:
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
@@ -1165,6 +1189,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -1202,6 +1232,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -2052,4 +2088,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 9affd9d..a25142f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -69,6 +69,11 @@ topology_template:
     port_pcm_port_00_network_role:
       type: string
       required: true
+    port_pcm_port_00_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_00_ip_requirements:
       type: list
       required: true
@@ -86,6 +91,11 @@ topology_template:
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_01_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     security_group_name:
       label: security group name
       hidden: false
@@ -161,6 +171,12 @@ topology_template:
     pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_00_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_00_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_00_ip_requirements
         security_groups:
@@ -170,8 +186,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_00_mac_requirements
         subinterface_indicator: false
@@ -181,8 +195,6 @@ topology_template:
           get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_00_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_00_order
       requirements:
@@ -193,6 +205,12 @@ topology_template:
     pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_01_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_01_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_01_ip_requirements
         security_groups:
@@ -202,8 +220,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_01_mac_requirements
         subinterface_indicator: false
@@ -213,8 +229,6 @@ topology_template:
           get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_01_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_01_order
       requirements:
@@ -452,4 +466,4 @@ topology_template:
       - link
       dependency_server_oam:
       - server_oam
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index d716bdc..70beb64 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -46,6 +51,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -167,6 +177,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -176,8 +192,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -187,8 +201,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -212,6 +224,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -221,8 +239,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -232,8 +248,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -471,4 +485,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7b832db..27cd819 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -45,6 +51,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -650,6 +662,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_00_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_00_ip_requirements:
         type: list
         required: true
@@ -666,6 +684,12 @@ node_types:
         description: flavor name of PCRF CM instance
         required: true
         status: SUPPORTED
+      port_pcm_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
@@ -1160,6 +1184,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -1197,6 +1227,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -2030,4 +2066,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 9affd9d..a25142f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -69,6 +69,11 @@ topology_template:
     port_pcm_port_00_network_role:
       type: string
       required: true
+    port_pcm_port_00_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_00_ip_requirements:
       type: list
       required: true
@@ -86,6 +91,11 @@ topology_template:
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
+    port_pcm_port_01_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     security_group_name:
       label: security group name
       hidden: false
@@ -161,6 +171,12 @@ topology_template:
     pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_00_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_00_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_00_ip_requirements
         security_groups:
@@ -170,8 +186,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_00_mac_requirements
         subinterface_indicator: false
@@ -181,8 +195,6 @@ topology_template:
           get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_00_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_00_order
       requirements:
@@ -193,6 +205,12 @@ topology_template:
     pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_01_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_01_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_01_ip_requirements
         security_groups:
@@ -202,8 +220,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_01_mac_requirements
         subinterface_indicator: false
@@ -213,8 +229,6 @@ topology_template:
           get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_01_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_01_order
       requirements:
@@ -452,4 +466,4 @@ topology_template:
       - link
       dependency_server_oam:
       - server_oam
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index 8272ab5..b762c58 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -46,6 +51,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -161,6 +171,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -170,8 +186,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -181,8 +195,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -206,6 +218,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -215,8 +233,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -226,8 +242,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -465,4 +479,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b583725..933ff40 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -40,6 +46,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -627,6 +639,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_compute_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_compute_port_network_role_tag:
         type: string
         required: true
@@ -996,4 +1014,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
index 0f397b9..82f9414 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
@@ -50,6 +50,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_compute_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_compute_port_network_role_tag:
       type: string
       required: true
@@ -118,6 +123,8 @@ topology_template:
         vlan_requirements:
           get_input: port_compute_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_compute_port_related_networks
         ip_requirements:
           get_input: port_compute_port_ip_requirements
         network_role_tag:
@@ -313,4 +320,4 @@ topology_template:
       - link
       dependency_compute:
       - compute
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
index 1e7caa5..1c527e6 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -40,6 +45,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -149,6 +159,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -158,8 +174,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -169,8 +183,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -194,6 +206,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -203,8 +221,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -214,8 +230,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -453,4 +467,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 76ab120..b8e0c1e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -23,6 +23,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_1port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       pcm_image_name:
         type: string
         description: PCRF CM image name
@@ -82,6 +88,12 @@ node_types:
         description: CPS network gateway
         required: true
         status: SUPPORTED
+      port_pcm_2port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_1port_0_network_role:
         type: string
         required: true
@@ -876,4 +888,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 6e4407c..f31ab49 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -25,6 +25,11 @@ topology_template:
     port_pcm_1port_0_network_role_tag:
       type: string
       required: true
+    port_pcm_1port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     pcm_image_name:
       label: image name
       hidden: false
@@ -81,6 +86,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network gateway
+    port_pcm_2port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_1port_0_network_role:
       type: string
       required: true
@@ -162,6 +172,12 @@ topology_template:
     pcm_1port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_1port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_1port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_1port_0_ip_requirements
         security_groups:
@@ -171,8 +187,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_1port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_1port_0_mac_requirements
         subinterface_indicator: false
@@ -182,8 +196,6 @@ topology_template:
           get_input: port_pcm_1port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_1port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_1port_0_order
       requirements:
@@ -194,6 +206,12 @@ topology_template:
     pcm_2port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_2port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_2port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_2port_1_ip_requirements
         security_groups:
@@ -203,8 +221,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_2port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_2port_1_mac_requirements
         subinterface_indicator: false
@@ -214,8 +230,6 @@ topology_template:
           get_input: port_pcm_2port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_2port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_2port_1_order
       requirements:
@@ -453,4 +467,4 @@ topology_template:
       - dependency
       link_pcm_2port_1:
       - pcm_2port_1
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d9bdb00..6676af8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1497,4 +1503,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml
index 692fdc2..0e7c780 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -129,6 +134,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_related_networks
         network_role_tag:
           get_input: port_pcm_port_network_role_tag
         network_role:
@@ -322,4 +329,4 @@ topology_template:
       - local_storage
       dependency_pcm_server:
       - pcm_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 30b8f79..438512f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -447,6 +453,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -1656,4 +1668,4 @@ node_types:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml
index 692fdc2..0e7c780 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -129,6 +134,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_related_networks
         network_role_tag:
           get_input: port_pcm_port_network_role_tag
         network_role:
@@ -322,4 +329,4 @@ topology_template:
       - local_storage
       dependency_pcm_server:
       - pcm_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml
index 6b122e7..33fc413 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -129,6 +134,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pcm_port_ip_requirements
+        related_networks:
+          get_input: port_pcm_port_related_networks
         network_role_tag:
           get_input: port_pcm_port_network_role_tag
         network_role:
@@ -322,4 +329,4 @@ topology_template:
       - link
       dependency_pd_server_pcm_port:
       - pd_server_pcm_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bc682ab..3ad4ddf 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,6 +12,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_11_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -80,6 +86,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
@@ -617,6 +629,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_12_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_12_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -706,6 +724,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_02_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_12_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -1150,6 +1174,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -1182,6 +1212,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -1717,4 +1753,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 0a53c42..0076537 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -40,6 +45,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -149,6 +159,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -158,8 +174,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -169,8 +183,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -194,6 +206,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -203,8 +221,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -214,8 +230,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -453,4 +467,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index c76abdd..3e8eddc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_pcm_port_11_network_role_tag:
       type: string
       required: true
+    port_pcm_port_11_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -80,6 +85,11 @@ topology_template:
     port_pcm_port_11_network_role:
       type: string
       required: true
+    port_pcm_port_01_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     security_group_name:
       label: security group name
       hidden: false
@@ -149,6 +159,12 @@ topology_template:
     pcm_port_11:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_11_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_11_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_11_ip_requirements
         security_groups:
@@ -158,8 +174,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_11_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_11_mac_requirements
         subinterface_indicator: false
@@ -169,8 +183,6 @@ topology_template:
           get_input: port_pcm_port_11_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_11_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_11_order
       requirements:
@@ -181,6 +193,12 @@ topology_template:
     pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_01_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_01_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_01_ip_requirements
         security_groups:
@@ -190,8 +208,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_01_mac_requirements
         subinterface_indicator: false
@@ -201,8 +217,6 @@ topology_template:
           get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_01_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_01_order
       requirements:
@@ -453,4 +467,4 @@ topology_template:
       - link
       local_storage_server_pcm_1:
       - server_pcm_1
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
index 1026374..856c876 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
@@ -45,6 +45,11 @@ topology_template:
     port_pcm_port_02_network_role_tag:
       type: string
       required: true
+    port_pcm_port_12_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_12_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -137,6 +142,11 @@ topology_template:
     port_pcm_port_12_network_role_tag:
       type: string
       required: true
+    port_pcm_port_02_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_12_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -149,6 +159,12 @@ topology_template:
     pcm_port_12:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_12_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_12_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_12_ip_requirements
         security_groups:
@@ -158,8 +174,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_12_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_12_mac_requirements
         subinterface_indicator: false
@@ -169,8 +183,6 @@ topology_template:
           get_input: port_pcm_port_12_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_12_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_12_order
       requirements:
@@ -181,6 +193,12 @@ topology_template:
     pcm_port_02:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_02_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_02_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_02_ip_requirements
         security_groups:
@@ -190,8 +208,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_02_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_02_mac_requirements
         subinterface_indicator: false
@@ -201,8 +217,6 @@ topology_template:
           get_input: port_pcm_port_02_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_02_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_02_order
       requirements:
@@ -453,4 +467,4 @@ topology_template:
       - link
       local_storage_server_pcm_2:
       - server_pcm_2
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7268317..a3e7eb4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,6 +12,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_11_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -80,6 +86,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
@@ -579,6 +591,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_2:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -611,6 +629,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -1154,6 +1178,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_11_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       availabilityzone_name:
         type: string
         description: availabilityzone name
@@ -1222,6 +1252,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_01_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       security_group_name:
         type: string
         description: the name of security group
@@ -1717,4 +1753,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
index bdeda34..de90d92 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_pcm_port_11_network_role_tag:
       type: string
       required: true
+    port_pcm_port_11_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
@@ -80,6 +85,11 @@ topology_template:
     port_pcm_port_11_network_role:
       type: string
       required: true
+    port_pcm_port_01_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     security_group_name:
       label: security group name
       hidden: false
@@ -149,6 +159,12 @@ topology_template:
     pcm_port_11:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_11_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_11_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_11_ip_requirements
         security_groups:
@@ -158,8 +174,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_11_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_11_mac_requirements
         subinterface_indicator: false
@@ -169,8 +183,6 @@ topology_template:
           get_input: port_pcm_port_11_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_11_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_11_order
       requirements:
@@ -181,6 +193,12 @@ topology_template:
     pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_01_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_01_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_01_ip_requirements
         security_groups:
@@ -190,8 +208,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_01_mac_requirements
         subinterface_indicator: false
@@ -201,8 +217,6 @@ topology_template:
           get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_01_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_01_order
       requirements:
@@ -453,4 +467,4 @@ topology_template:
       - link
       local_storage_server_pcm_1:
       - server_pcm_1
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
index efe9830..f70040d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -40,6 +45,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -149,6 +159,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -158,8 +174,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -169,8 +183,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -194,6 +206,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -203,8 +221,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -214,8 +230,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -453,4 +467,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3a0a107..81a7353 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -40,6 +46,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -579,6 +591,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server_1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -611,6 +629,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -1441,4 +1465,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 1e7caa5..1c527e6 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -40,6 +45,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -149,6 +159,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -158,8 +174,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -169,8 +183,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -194,6 +206,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -203,8 +221,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -214,8 +230,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -453,4 +467,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9d3d07a..2f86795 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -431,4 +437,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 9399f0b..7f4ab4a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,23 +105,25 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
+        exCP_naming:
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5e0a3d7..5240086 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -441,4 +447,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 2976d03..28b65b6 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,23 +105,25 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
+        exCP_naming:
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -323,4 +330,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b970514..389ae74 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -437,4 +443,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
index c4c49ef..3b9665a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -109,23 +114,25 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
+        exCP_naming:
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -313,4 +320,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2e88f75..0869edf 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -419,4 +425,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
index 4157d58..376d974 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -90,23 +95,25 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
         replacement_policy:
           get_attribute:
           - pd_server
           - accessIPv4
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
+        exCP_naming:
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -294,4 +301,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 494f1fc..4cac9cc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -437,4 +443,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index e9a7794..974367b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -124,6 +129,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
         network_role:
@@ -313,4 +320,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9d3d07a..2f86795 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -431,4 +437,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 9399f0b..7f4ab4a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,23 +105,25 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
+        exCP_naming:
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b6d4b3f..3c33dad 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -44,6 +44,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -437,4 +443,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
index 27c5771..51236d7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
@@ -41,6 +41,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -109,23 +114,25 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
+        exCP_naming:
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -313,4 +320,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cebc59c..9dcebc3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -441,4 +447,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 54eff7e..2bbdf87 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,23 +105,25 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
+        exCP_naming:
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -323,4 +330,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5326386..bf6c649 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -475,6 +481,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps01_port_order:
         type: integer
         required: true
@@ -858,4 +870,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 9399f0b..7f4ab4a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,23 +105,25 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
+        exCP_naming:
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
index c64c7f1..adb7631 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
@@ -44,6 +44,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps01_port_order:
       type: integer
       required: true
@@ -100,23 +105,25 @@ topology_template:
     ps_server_ps01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_ps01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_ps01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_ps01_port_mac_requirements
+        order:
+          get_input: port_ps01_port_order
+        exCP_naming:
+          get_input: port_ps01_port_exCP_naming
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
+        related_networks:
+          get_input: port_ps01_port_related_networks
         network_role_tag:
           get_input: port_ps01_port_network_role_tag
-        mac_requirements:
-          get_input: port_ps01_port_mac_requirements
-        order:
-          get_input: port_ps01_port_order
         network_role:
           get_input: port_ps01_port_network_role
         subnetpoolid:
@@ -304,4 +311,4 @@ topology_template:
       - dependency
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b8bd4c0..2fb8dca 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -479,6 +485,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps01_port_order:
         type: integer
         required: true
@@ -866,4 +878,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
index 6929803..520dd11 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,23 +105,25 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
+        exCP_naming:
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -311,4 +318,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
index 2fbc68e..1a9e525 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
@@ -44,6 +44,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps01_port_order:
       type: integer
       required: true
@@ -100,23 +105,25 @@ topology_template:
     ps_server_ps01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_ps01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_ps01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_ps01_port_mac_requirements
+        order:
+          get_input: port_ps01_port_order
+        exCP_naming:
+          get_input: port_ps01_port_exCP_naming
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
+        related_networks:
+          get_input: port_ps01_port_related_networks
         network_role_tag:
           get_input: port_ps01_port_network_role_tag
-        mac_requirements:
-          get_input: port_ps01_port_mac_requirements
-        order:
-          get_input: port_ps01_port_order
         network_role:
           get_input: port_ps01_port_network_role
         subnetpoolid:
@@ -311,4 +318,4 @@ topology_template:
       - dependency
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 615de8d..7055e47 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,14 +8,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -28,60 +20,92 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd02_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_order:
-        type: integer
+      port_pd01_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd02_port_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd02_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_network_role_tag:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_pd_server_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd02_port_vlan_requirements:
+      port_pd01_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      vm_image_name:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd02_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pd02_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd02_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd01_port_order:
         type: integer
         required: true
@@ -108,24 +132,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd02_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_user_data_format:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -551,4 +563,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml
index a6d5ed6..f6acc07 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml
@@ -838,9 +838,6 @@ topology_template:
         - get_input:
           - pd_server_names
           - 0
-        port_pd02_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
         port_pd02_port_network_role_tag: oam
@@ -855,6 +852,11 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        compute_pd_server_user_data_format:
+        - RAW
+        port_pd02_port_mac_requirements:
+          mac_count_required:
+            is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
         port_pd02_port_ip_requirements:
@@ -866,8 +868,6 @@ topology_template:
         port_pd01_port_network_role_tag: oam
         port_pd02_port_network:
         - get_input: oam_net_name
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -883,4 +883,4 @@ topology_template:
         heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
         description: heat template that creates MOG stack
       members:
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
index 3c0aeae..e894e5c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,13 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -28,32 +21,15 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd02_port_order:
-      type: integer
-      required: true
-    port_pd02_port_subnetpoolid:
-      type: string
-      required: true
     port_pd02_port_network_role_tag:
       type: string
       required: true
     port_pd01_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd02_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     vm_image_name:
       type: string
       required: true
@@ -62,14 +38,58 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+    port_pd02_port_network_role:
+      type: string
+      required: true
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_pd_server_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd02_port_network_role:
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd02_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd02_port_order:
+      type: integer
+      required: true
+    port_pd02_port_subnetpoolid:
       type: string
       required: true
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_order:
       type: integer
       required: true
@@ -90,21 +110,11 @@ topology_template:
     port_pd01_port_network_role_tag:
       type: string
       required: true
-    port_pd01_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd02_port_network:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -399,4 +413,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 43c0f0b..73bbefd 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -72,6 +72,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_port1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_port1_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -443,4 +449,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
index 2aa4377..b705dc9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
@@ -63,6 +63,11 @@ topology_template:
     vm_image_name:
       type: string
       required: true
+    port_port1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_port1_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -91,23 +96,25 @@ topology_template:
     smp_port1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_port1_exCP_naming
         replacement_policy:
           get_input:
           - port_port1_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_port1_mac_requirements
+        order:
+          get_input: port_port1_order
+        exCP_naming:
+          get_input: port_port1_exCP_naming
         vlan_requirements:
           get_input: port_port1_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_port1_ip_requirements
+        related_networks:
+          get_input: port_port1_related_networks
         network_role_tag:
           get_input: port_port1_network_role_tag
-        mac_requirements:
-          get_input: port_port1_mac_requirements
-        order:
-          get_input: port_port1_order
         network_role:
           get_input: port_port1_network_role
         subnetpoolid:
@@ -322,4 +329,4 @@ topology_template:
       - link
       local_storage_smp:
       - smp
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c4d4e6b..687aafc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -76,6 +76,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -92,6 +98,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_order:
         type: integer
         required: true
@@ -575,4 +587,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index 14e9708..e0cd25b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -66,6 +66,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -79,6 +84,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd02_port_order:
       type: integer
       required: true
@@ -167,6 +177,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
         network_role:
@@ -204,6 +216,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
+        related_networks:
+          get_input: port_pd02_port_related_networks
         network_role_tag:
           get_input: port_pd02_port_network_role_tag
         network_role:
@@ -435,4 +449,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7c03026..c248954 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -70,6 +70,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -86,6 +92,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd02_port_order:
         type: integer
         required: true
@@ -563,4 +575,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index e5183bd..ad02c9e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -61,6 +61,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -74,6 +79,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd02_port_order:
       type: integer
       required: true
@@ -138,23 +148,25 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
+        exCP_naming:
+          get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -171,23 +183,25 @@ topology_template:
     pd_server_pd02_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd02_port_exCP_naming
         replacement_policy:
           get_input:
           - port_pd02_port_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd02_port_mac_requirements
+        order:
+          get_input: port_pd02_port_order
+        exCP_naming:
+          get_input: port_pd02_port_exCP_naming
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
+        related_networks:
+          get_input: port_pd02_port_related_networks
         network_role_tag:
           get_input: port_pd02_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd02_port_mac_requirements
-        order:
-          get_input: port_pd02_port_order
         network_role:
           get_input: port_pd02_port_network_role
         subnetpoolid:
@@ -417,4 +431,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7ff82db..76400dd 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -96,6 +96,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
@@ -114,6 +120,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_pd01_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -575,4 +587,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index 8460f43..a67096d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -81,6 +81,11 @@ topology_template:
     port_pd01_port_0_network_role_tag:
       type: string
       required: true
+    port_pd01_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd01_port_1_ip_requirements:
       type: list
       required: true
@@ -96,6 +101,11 @@ topology_template:
     port_pd01_port_1_order:
       type: integer
       required: true
+    port_pd01_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd01_port_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -167,6 +177,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_1_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_1_related_networks
         network_role_tag:
           get_input: port_pd01_port_1_network_role_tag
         network_role:
@@ -204,6 +216,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_0_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_0_related_networks
         network_role_tag:
           get_input: port_pd01_port_0_network_role_tag
         network_role:
@@ -435,4 +449,4 @@ topology_template:
       - link
       link_pd_server_pd01_port_1:
       - pd_server_pd01_port_1
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4af5b2d..dae6936 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -90,6 +90,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port_1_ip_requirements:
         type: list
         required: true
@@ -108,6 +114,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_pd01_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -563,4 +575,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index f8630d5..c2e283a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -76,6 +76,11 @@ topology_template:
     port_pd01_port_0_network_role_tag:
       type: string
       required: true
+    port_pd01_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd01_port_1_ip_requirements:
       type: list
       required: true
@@ -91,6 +96,11 @@ topology_template:
     port_pd01_port_1_order:
       type: integer
       required: true
+    port_pd01_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd01_port_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -138,23 +148,25 @@ topology_template:
     pd_server_pd01_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_1_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_1_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_1_mac_requirements
+        order:
+          get_input: port_pd01_port_1_order
+        exCP_naming:
+          get_input: port_pd01_port_1_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_1_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_1_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_1_related_networks
         network_role_tag:
           get_input: port_pd01_port_1_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_1_mac_requirements
-        order:
-          get_input: port_pd01_port_1_order
         network_role:
           get_input: port_pd01_port_1_network_role
         subnetpoolid:
@@ -171,23 +183,25 @@ topology_template:
     pd_server_pd01_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
-        exCP_naming:
-          get_input: port_pd01_port_0_exCP_naming
         replacement_policy:
           get_input:
           - port_pd01_port_0_replacement_policy
           - index_value
+        mac_requirements:
+          get_input: port_pd01_port_0_mac_requirements
+        order:
+          get_input: port_pd01_port_0_order
+        exCP_naming:
+          get_input: port_pd01_port_0_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_0_vlan_requirements
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_0_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_0_related_networks
         network_role_tag:
           get_input: port_pd01_port_0_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_0_mac_requirements
-        order:
-          get_input: port_pd01_port_0_order
         network_role:
           get_input: port_pd01_port_0_network_role
         subnetpoolid:
@@ -417,4 +431,4 @@ topology_template:
       - link
       link_pd_server_pd01_port_1:
       - pd_server_pd01_port_1
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d4f3cb8..dff3dda 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,14 +8,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -28,60 +20,92 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd02_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_order:
-        type: integer
+      port_pd01_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd02_port_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd02_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_network_role_tag:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_pd_server_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd02_port_vlan_requirements:
+      port_pd01_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      vm_image_name:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd02_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pd02_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd02_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd01_port_order:
         type: integer
         required: true
@@ -108,24 +132,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd02_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_user_data_format:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -555,6 +567,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.pcm_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      port_pcm_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_0_network_role:
         type: string
         required: true
@@ -592,6 +610,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pcm_port_0_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pcm_port_1_subnetpoolid:
         type: string
         required: true
@@ -1159,4 +1183,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
index e7fa960..e615ef7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
@@ -869,9 +869,6 @@ topology_template:
         - get_input:
           - pd_server_names
           - 0
-        port_pd02_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
         port_pd02_port_network_role_tag: oam
@@ -886,6 +883,11 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        compute_pd_server_user_data_format:
+        - RAW
+        port_pd02_port_mac_requirements:
+          mac_count_required:
+            is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
         port_pd02_port_ip_requirements:
@@ -897,8 +899,6 @@ topology_template:
         port_pd01_port_network_role_tag: oam
         port_pd02_port_network:
         - get_input: oam_net_name
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -915,4 +915,4 @@ topology_template:
         description: heat template that creates MOG stack
       members:
       - server_pcm_003
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
index 3c0aeae..e894e5c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,13 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -28,32 +21,15 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd02_port_order:
-      type: integer
-      required: true
-    port_pd02_port_subnetpoolid:
-      type: string
-      required: true
     port_pd02_port_network_role_tag:
       type: string
       required: true
     port_pd01_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd02_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     vm_image_name:
       type: string
       required: true
@@ -62,14 +38,58 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+    port_pd02_port_network_role:
+      type: string
+      required: true
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_pd_server_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd02_port_network_role:
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd02_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd02_port_order:
+      type: integer
+      required: true
+    port_pd02_port_subnetpoolid:
       type: string
       required: true
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_order:
       type: integer
       required: true
@@ -90,21 +110,11 @@ topology_template:
     port_pd01_port_network_role_tag:
       type: string
       required: true
-    port_pd01_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd02_port_network:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -399,4 +413,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
index 02aa261..5ca8297 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_pcm_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_0_network_role:
       type: string
       required: true
@@ -46,6 +51,11 @@ topology_template:
     port_pcm_port_0_subnetpoolid:
       type: string
       required: true
+    port_pcm_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pcm_port_1_subnetpoolid:
       type: string
       required: true
@@ -161,6 +171,12 @@ topology_template:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_1_related_networks
+        network:
+          get_input: oam_net_name
         ip_requirements:
           get_input: port_pcm_port_1_ip_requirements
         security_groups:
@@ -170,8 +186,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_1_mac_requirements
         subinterface_indicator: false
@@ -181,8 +195,6 @@ topology_template:
           get_input: port_pcm_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_1_network_role_tag
-        network:
-          get_input: oam_net_name
         order:
           get_input: port_pcm_port_1_order
       requirements:
@@ -206,6 +218,12 @@ topology_template:
     pcm_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pcm_port_0_subnetpoolid
+        related_networks:
+          get_input: port_pcm_port_0_related_networks
+        network:
+          get_input: cps_net_name
         ip_requirements:
           get_input: port_pcm_port_0_ip_requirements
         security_groups:
@@ -215,8 +233,6 @@ topology_template:
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
-        subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
           get_input: port_pcm_port_0_mac_requirements
         subinterface_indicator: false
@@ -226,8 +242,6 @@ topology_template:
           get_input: port_pcm_port_0_vlan_requirements
         network_role_tag:
           get_input: port_pcm_port_0_network_role_tag
-        network:
-          get_input: cps_net_name
         order:
           get_input: port_pcm_port_0_order
       requirements:
@@ -486,4 +500,4 @@ topology_template:
       - dependency
       dependency_pcm_port_1:
       - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3a97da1..dd9ab9a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -24,28 +24,10 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd01_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -58,74 +40,104 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_1_order:
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_1_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port_1_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network_role:
+      port_pd01_port_1_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_0_order:
-        type: integer
+      port_pd01_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_vlan_requirements:
+      port_pd01_port_1_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: string
+      compute_pd_server_user_data_format:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_subnetpoolid:
+        entry_schema:
+          type: string
+      port_pd01_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      vm_image_name:
-        type: string
+      port_pd01_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd01_port_1_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network_role_tag:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd01_port_1_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd01_port_0_vlan_requirements:
+      port_pd01_port_1_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port_0_subnetpoolid:
-        type: string
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd01_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network:
+      port_pd01_port_1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_user_data_format:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd01_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd01_port_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -551,4 +563,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml
index cdc3fd4..585eb1e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml
@@ -838,13 +838,6 @@ topology_template:
         port_pd01_port_0_network:
         - get_input: oam_net_name
         port_pd01_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_pd01_port_0_network_role_tag: oam
-        port_pd01_port_1_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
@@ -858,9 +851,6 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_image_name:
           get_input: pd_image_name
         port_pd01_port_1_network_role_tag: oam
@@ -868,6 +858,16 @@ topology_template:
         - get_input: oam_net_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd01_port_0_network_role_tag: oam
+        port_pd01_port_1_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_pd01_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -883,4 +883,4 @@ topology_template:
         heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
         description: heat template that creates MOG stack
       members:
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
index 0dd90f3..bdf0a31 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
@@ -24,24 +24,9 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_0_network_role_tag:
-      type: string
-      required: true
     port_pd01_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -52,46 +37,24 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_1_order:
-      type: integer
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     port_pd01_port_1_network_role:
       type: string
       required: true
     port_pd01_port_0_order:
       type: integer
       required: true
-    port_pd01_port_1_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_pd01_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_pd01_port_1_subnetpoolid:
       type: string
       required: true
     vm_image_name:
       type: string
       required: true
-    port_pd01_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     port_pd01_port_1_network_role_tag:
       type: string
       required: true
-    port_pd01_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd01_port_0_subnetpoolid:
       type: string
       required: true
@@ -105,6 +68,53 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_network_role_tag:
+      type: string
+      required: true
+    port_pd01_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd01_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_1_order:
+      type: integer
+      required: true
+    port_pd01_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd01_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_1_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_1_related_networks
         ip_requirements:
           get_input: port_pd01_port_1_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_0_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_0_related_networks
         ip_requirements:
           get_input: port_pd01_port_0_ip_requirements
         network_role_tag:
@@ -399,4 +413,4 @@ topology_template:
       - link
       link_pd_server_pd01_port_1:
       - pd_server_pd01_port_1
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d689fd8..54a9238 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -14,24 +14,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd_1_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd_1_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       port_pd_2_port_1_vlan_requirements:
         type: list
         required: true
@@ -60,22 +42,20 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_2_port_1_subnetpoolid:
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      vm_flavor_name:
-        type: string
+      port_pd_2_port_1_related_networks:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_2_port_1_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_pd_2_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vm_image_name:
         type: string
         required: true
@@ -88,44 +68,76 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd_1_port_0_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pd_1_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd_1_port_0_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_1_port_0_ip_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd_2_port_1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_1_port_0_network_role_tag:
+      port_pd_2_port_1_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_2_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      compute_pd_server_user_data_format:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_2_port_1_ip_requirements:
+        entry_schema:
+          type: string
+      port_pd_1_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd_2_port_1_network_role_tag:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_1_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      compute_pd_server_user_data_format:
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd_2_port_1_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd_1_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd_2_port_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd_1_port_0_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pd_1_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd_1_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd_2_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -551,4 +563,4 @@ node_types:
         type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml
index 81e6cac..27ed7f0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml
@@ -855,10 +855,6 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd_1_port_0_network_role_tag: oam
-        port_pd_2_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
         port_pd_2_port_1_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -868,6 +864,10 @@ topology_template:
         port_pd_2_port_1_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
+        port_pd_1_port_0_network_role_tag: oam
+        port_pd_2_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -883,4 +883,4 @@ topology_template:
         heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
         description: heat template that creates MOG stack
       members:
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml
index 58da312..dbed687 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/Nested_pd_serverServiceTemplate.yaml
@@ -16,21 +16,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd_1_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_pd_1_port_0_network_role:
-      type: string
-      required: true
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     port_pd_2_port_1_vlan_requirements:
       type: list
       required: true
@@ -54,18 +39,17 @@ topology_template:
     port_pd_2_port_1_network_role:
       type: string
       required: true
-    port_pd_2_port_1_subnetpoolid:
-      type: string
-      required: true
     vm_flavor_name:
       type: string
       required: true
+    port_pd_2_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_2_port_1_order:
       type: integer
       required: true
-    port_pd_2_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vm_image_name:
       type: string
       required: true
@@ -75,23 +59,11 @@ topology_template:
     port_pd_1_port_0_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd_1_port_0_order:
-      type: integer
-      required: true
-    port_pd_1_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     port_pd_1_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd_1_port_0_network_role_tag:
-      type: string
-      required: true
-    port_pd_2_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_pd_2_port_1_ip_requirements:
       type: list
       required: true
@@ -105,6 +77,44 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_1_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd_1_port_0_network_role:
+      type: string
+      required: true
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd_2_port_1_subnetpoolid:
+      type: string
+      required: true
+    port_pd_1_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd_2_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd_1_port_0_order:
+      type: integer
+      required: true
+    port_pd_1_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd_1_port_0_network_role_tag:
+      type: string
+      required: true
+    port_pd_2_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd_2_port_1_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd_2_port_1_related_networks
         ip_requirements:
           get_input: port_pd_2_port_1_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd_1_port_0_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd_1_port_0_related_networks
         ip_requirements:
           get_input: port_pd_1_port_0_ip_requirements
         network_role_tag:
@@ -399,4 +413,4 @@ topology_template:
       - dependency
       link_pd_server_pd_1_port_0:
       - pd_server_pd_1_port_0
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2c72b0a..eb1d96a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,25 +12,17 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_oam1_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pd_oam1_port_1_ip_requirements:
+      port_pd_oam1_port_0_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd_oam1_port_0_network_role:
+        type: string
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_pd_oam1_port_0_ip_requirements:
+      port_pd_oam1_port_1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -56,26 +48,54 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_pd_oam1_port_0_vlan_requirements:
+      port_pd_oam1_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd_oam1_port_1_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd_oam1_port_1_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      compute_pd_server_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd_oam1_port_1_network:
+          type: string
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd_oam1_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pd_oam1_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd_oam1_port_0_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd_oam1_port_1_network_role:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_oam1_port_1_network:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       port_pd_oam1_port_1_subnetpoolid:
         type: string
         required: true
@@ -94,22 +114,20 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
+      port_pd_oam1_port_0_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd_oam1_port_0_subnetpoolid:
-        type: string
+      port_pd_oam1_port_1_related_networks:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_oam1_port_0_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd_oam1_port_1_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd_oam1_port_1_vlan_requirements:
         type: list
         required: true
@@ -120,12 +138,6 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      compute_pd_server_user_data_format:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -551,4 +563,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml
index 4f4840d..b64ee2f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml
@@ -834,12 +834,6 @@ topology_template:
       properties:
         port_pd_oam1_port_0_network_role_tag: oam
         port_pd_oam1_port_1_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_pd_oam1_port_0_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
@@ -853,21 +847,27 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd_oam1_port_1_network:
-        - get_input: oam_net_name
         port_pd_oam1_port_1_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pd_oam1_port_0_network:
-        - get_input: oam_net_name
         vm_image_name:
           get_input: pd_image_name
         port_pd_oam1_port_1_network_role_tag: oam
+        compute_pd_server_user_data_format:
+        - RAW
+        port_pd_oam1_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_pd_oam1_port_1_network:
+        - get_input: oam_net_name
+        port_pd_oam1_port_0_network:
+        - get_input: oam_net_name
         port_pd_oam1_port_0_mac_requirements:
           mac_count_required:
             is_required: false
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -883,4 +883,4 @@ topology_template:
         heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
         description: heat template that creates MOG stack
       members:
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml
index fdcc754..b66be45 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/Nested_pd_serverServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_pd_oam1_port_0_network_role_tag:
       type: string
       required: true
+    port_pd_oam1_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_oam1_port_0_network_role:
       type: string
       required: true
@@ -22,18 +27,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    port_pd_oam1_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -50,6 +43,35 @@ topology_template:
     port_pd_oam1_port_1_order:
       type: integer
       required: true
+    port_pd_oam1_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd_oam1_port_1_network_role:
+      type: string
+      required: true
+    vm_image_name:
+      type: string
+      required: true
+    port_pd_oam1_port_1_network_role_tag:
+      type: string
+      required: true
+    compute_pd_server_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd_oam1_port_0_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     port_pd_oam1_port_0_vlan_requirements:
       type: list
       required: true
@@ -60,12 +82,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd_oam1_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd_oam1_port_1_network_role:
-      type: string
-      required: true
     port_pd_oam1_port_1_subnetpoolid:
       type: string
       required: true
@@ -80,18 +96,17 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
     port_pd_oam1_port_0_subnetpoolid:
       type: string
       required: true
+    port_pd_oam1_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_oam1_port_0_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_pd_oam1_port_1_network_role_tag:
-      type: string
-      required: true
     port_pd_oam1_port_1_vlan_requirements:
       type: list
       required: true
@@ -100,11 +115,6 @@ topology_template:
     port_pd_oam1_port_0_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    compute_pd_server_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd_oam1_port_1_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd_oam1_port_1_related_networks
         ip_requirements:
           get_input: port_pd_oam1_port_1_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd_oam1_port_0_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd_oam1_port_0_related_networks
         ip_requirements:
           get_input: port_pd_oam1_port_0_ip_requirements
         network_role_tag:
@@ -399,4 +413,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd_oam1_port_1:
       - pd_server_pd_oam1_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8f9cd39..aff2120 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -28,24 +28,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pd01_port1_related_networks:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port2_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -58,74 +52,92 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port1_subnetpoolid:
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port2_subnetpoolid:
+      port_pd01_port2_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port2_network_role:
-        type: string
+      port_pd01_port1_order:
+        type: integer
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port2_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port1_ip_requirements:
+      port_pd01_port2_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port2_network_role_tag:
-        type: string
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd01_port2_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port1_order:
-        type: integer
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd01_port2_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port1_network_role:
-        type: string
+      compute_pd_server_user_data_format:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port2_mac_requirements:
+        entry_schema:
+          type: string
+      port_pd01_port1_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd01_port2_order:
+      index_value:
         type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd01_port1_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port1_vlan_requirements:
-        type: list
+      port_pd01_port2_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      vm_image_name:
+      port_pd01_port2_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port2_vlan_requirements:
+      port_pd01_port1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port2_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd01_port1_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      compute_pd_server_user_data_format:
+      port_pd01_port2_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd01_port1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
     - dependency_pd_server_pd01_port1:
         capability: tosca.capabilities.Node
@@ -551,4 +563,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
index 1b60832..956ca42 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
@@ -837,9 +837,6 @@ topology_template:
         port_pd01_port1_network_role_tag: oam
         port_pd01_port2_network:
         - get_input: oam_net_name
-        port_pd01_port1_mac_requirements:
-          mac_count_required:
-            is_required: false
         port_pd01_port2_ip_requirements:
         - ip_version: 4
           ip_count_required:
@@ -854,20 +851,23 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_flavor_name
+        port_pd01_port2_network_role_tag: oam
+        vm_image_name:
+          get_input: pd_image_name
+        compute_pd_server_user_data_format:
+        - RAW
+        port_pd01_port1_mac_requirements:
+          mac_count_required:
+            is_required: false
         port_pd01_port1_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port2_network_role_tag: oam
         port_pd01_port2_mac_requirements:
           mac_count_required:
             is_required: false
-        vm_image_name:
-          get_input: pd_image_name
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -883,4 +883,4 @@ topology_template:
         heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
         description: heat template that creates MOG stack
       members:
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
index 906ea18..9923d48 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
@@ -27,21 +27,16 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pd01_port1_related_networks:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd01_port2_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -52,46 +47,26 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port1_subnetpoolid:
-      type: string
-      required: true
-    port_pd01_port2_subnetpoolid:
-      type: string
-      required: true
-    port_pd01_port2_network_role:
-      type: string
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     port_pd01_port2_network_role_tag:
       type: string
       required: true
     port_pd01_port1_order:
       type: integer
       required: true
-    port_pd01_port1_network_role:
-      type: string
-      required: true
-    port_pd01_port2_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_pd01_port2_order:
       type: integer
       required: true
-    port_pd01_port1_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     vm_image_name:
       type: string
       required: true
+    port_pd01_port2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd01_port2_vlan_requirements:
       type: list
       required: true
@@ -105,6 +80,41 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port1_subnetpoolid:
+      type: string
+      required: true
+    port_pd01_port2_subnetpoolid:
+      type: string
+      required: true
+    port_pd01_port2_network_role:
+      type: string
+      required: true
+    port_pd01_port1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pd01_port1_network_role:
+      type: string
+      required: true
+    port_pd01_port2_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
   node_templates:
     pd_server_pd01_port1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -114,6 +124,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port1_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port1_related_networks
         ip_requirements:
           get_input: port_pd01_port1_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port2_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port2_related_networks
         ip_requirements:
           get_input: port_pd01_port2_ip_requirements
         network_role_tag:
@@ -399,4 +413,4 @@ topology_template:
       - link
       link_pd_server_pd01_port1:
       - pd_server_pd01_port1
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d652fff..a8909d0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,14 +8,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -28,60 +20,92 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd02_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_order:
-        type: integer
+      port_pd01_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd02_port_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd02_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_network_role_tag:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_pd_server_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd02_port_vlan_requirements:
+      port_pd01_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      vm_image_name:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd02_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pd02_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd02_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd01_port_order:
         type: integer
         required: true
@@ -108,24 +132,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd02_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_user_data_format:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
     attributes:
       pd_server_accessIPv4:
         type: string
@@ -561,4 +573,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
index 4054d32..c07b4ff 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -838,9 +838,6 @@ topology_template:
         - get_input:
           - pd_server_names
           - 0
-        port_pd02_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
         port_pd02_port_network_role_tag: oam
@@ -855,6 +852,11 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        compute_pd_server_user_data_format:
+        - RAW
+        port_pd02_port_mac_requirements:
+          mac_count_required:
+            is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
         port_pd02_port_ip_requirements:
@@ -866,8 +868,6 @@ topology_template:
         port_pd01_port_network_role_tag: oam
         port_pd02_port_network:
         - get_input: oam_net_name
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -902,4 +902,4 @@ topology_template:
       value:
         get_attribute:
         - abstract_pd_server
-        - pd_server_accessIPv4
+        - pd_server_accessIPv4
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 33183ae..2703eb2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,13 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -28,32 +21,15 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd02_port_order:
-      type: integer
-      required: true
-    port_pd02_port_subnetpoolid:
-      type: string
-      required: true
     port_pd02_port_network_role_tag:
       type: string
       required: true
     port_pd01_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd02_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     vm_image_name:
       type: string
       required: true
@@ -62,14 +38,58 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+    port_pd02_port_network_role:
+      type: string
+      required: true
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_pd_server_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd02_port_network_role:
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd02_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd02_port_order:
+      type: integer
+      required: true
+    port_pd02_port_subnetpoolid:
       type: string
       required: true
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_order:
       type: integer
       required: true
@@ -90,21 +110,11 @@ topology_template:
     port_pd01_port_network_role_tag:
       type: string
       required: true
-    port_pd01_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd02_port_network:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -418,4 +432,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cf4a0e0..ddd2d22 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -54,6 +54,12 @@ node_types:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
         required: true
         status: SUPPORTED
+      port_template_VMInt_OAM_lb_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port_device_id:
         type: list
         required: true
@@ -118,6 +124,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_template_VMInt_OAM_lb_ip_requirements:
         type: list
         required: true
@@ -842,4 +854,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml
index e676206..d3a355c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml
@@ -48,6 +48,11 @@ topology_template:
     port_template_VMInt_OAM_lb_virtual_machine_interface_properties:
       type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
       required: true
+    port_template_VMInt_OAM_lb_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd01_port_device_id:
       type: list
       required: true
@@ -100,6 +105,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_template_VMInt_OAM_lb_ip_requirements:
       type: list
       required: true
@@ -360,6 +370,8 @@ topology_template:
           - port_template_VMInt_OAM_lb_virtual_machine_interface_properties
           - index_value
         subinterface_indicator: false
+        related_networks:
+          get_input: port_template_VMInt_OAM_lb_related_networks
         security_group_refs:
           get_input:
           - port_template_VMInt_OAM_lb_security_group_refs
@@ -396,30 +408,46 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        allowed_address_pairs:
+          get_input: port_pd01_port_allowed_address_pairs
+        binding:vnic_type:
+          get_input:
+          - port_pd01_port_binding:vnic_type
+          - index_value
+        value_specs:
+          get_input:
+          - port_pd01_port_value_specs
+          - index_value
+        network_role_tag:
+          get_input: port_pd01_port_network_role_tag
+        fixed_ips:
+          get_input:
+          - port_pd01_port_fixed_ips
+          - index_value
+        subnetpoolid:
+          get_input: port_pd01_port_subnetpoolid
+        name:
+          get_input:
+          - port_pd01_port_name
+          - index_value
+        network:
+          get_input:
+          - port_pd01_port_network
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
         mac_requirements:
           get_input: port_pd01_port_mac_requirements
-        allowed_address_pairs:
-          get_input: port_pd01_port_allowed_address_pairs
         order:
           get_input: port_pd01_port_order
-        binding:vnic_type:
-          get_input:
-          - port_pd01_port_binding:vnic_type
-          - index_value
         device_owner:
           get_input:
           - port_pd01_port_device_owner
           - index_value
         mac_address:
           get_input: port_pd01_port_mac_address
-        value_specs:
-          get_input:
-          - port_pd01_port_value_specs
-          - index_value
         security_groups:
           get_input:
           - port_pd01_port_security_groups
@@ -428,15 +456,15 @@ topology_template:
           get_input: port_pd01_port_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
-        subinterface_indicator: false
         qos_policy:
           get_input:
           - port_pd01_port_qos_policy
           - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
-        network_role_tag:
-          get_input: port_pd01_port_network_role_tag
+        related_networks:
+          get_input: port_pd01_port_related_networks
         port_security_enabled:
           get_input:
           - port_pd01_port_port_security_enabled
@@ -447,24 +475,10 @@ topology_template:
           - index_value
         network_role:
           get_input: port_pd01_port_network_role
-        subnetpoolid:
-          get_input: port_pd01_port_subnetpoolid
-        fixed_ips:
-          get_input:
-          - port_pd01_port_fixed_ips
-          - index_value
-        name:
-          get_input:
-          - port_pd01_port_name
-          - index_value
         device_id:
           get_input:
           - port_pd01_port_device_id
           - index_value
-        network:
-          get_input:
-          - port_pd01_port_network
-          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -874,4 +888,4 @@ topology_template:
       - dependency
       link_pd_server_template_VMInt_OAM_lb:
       - pd_server_template_VMInt_OAM_lb
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 0b464f4..bef6624 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,14 +8,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -28,60 +20,92 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd02_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_order:
-        type: integer
+      port_pd01_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd02_port_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd02_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_network_role_tag:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_pd_server_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd02_port_vlan_requirements:
+      port_pd01_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      vm_image_name:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd02_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pd02_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd02_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd01_port_order:
         type: integer
         required: true
@@ -108,24 +132,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd02_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_user_data_format:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
     attributes:
       pd_server_accessIPv4:
         type: string
@@ -558,4 +570,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml
index e9d7a14..cb35f4e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml
@@ -838,9 +838,6 @@ topology_template:
         - get_input:
           - pd_server_names
           - 0
-        port_pd02_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_input: pd_flavor_name
         port_pd02_port_network_role_tag: oam
@@ -855,6 +852,11 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        compute_pd_server_user_data_format:
+        - RAW
+        port_pd02_port_mac_requirements:
+          mac_count_required:
+            is_required: false
         port_pd01_port_network:
         - get_input: oam_net_name
         port_pd02_port_ip_requirements:
@@ -866,8 +868,6 @@ topology_template:
         port_pd01_port_network_role_tag: oam
         port_pd02_port_network:
         - get_input: oam_net_name
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -899,4 +899,4 @@ topology_template:
       members:
       - network_policy_port
       - network_policy_server
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
index 796f721..c987c41 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,13 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -28,32 +21,15 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd02_port_order:
-      type: integer
-      required: true
-    port_pd02_port_subnetpoolid:
-      type: string
-      required: true
     port_pd02_port_network_role_tag:
       type: string
       required: true
     port_pd01_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd02_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     vm_image_name:
       type: string
       required: true
@@ -62,14 +38,58 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+    port_pd02_port_network_role:
+      type: string
+      required: true
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_pd_server_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd02_port_network_role:
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd02_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd02_port_order:
+      type: integer
+      required: true
+    port_pd02_port_subnetpoolid:
       type: string
       required: true
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_order:
       type: integer
       required: true
@@ -90,21 +110,11 @@ topology_template:
     port_pd01_port_network_role_tag:
       type: string
       required: true
-    port_pd01_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd02_port_network:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -412,4 +426,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 615de8d..7055e47 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,14 +8,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -28,60 +20,92 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      vm_flavor_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      port_pd02_port_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_order:
-        type: integer
+      port_pd01_port_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd02_port_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd02_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd02_port_network_role_tag:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_mac_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      compute_pd_server_user_data_format:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd02_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd02_port_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd02_port_vlan_requirements:
+      port_pd01_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      vm_image_name:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd02_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pd02_port_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_ip_requirements:
+      port_pd02_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd01_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd02_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd01_port_order:
         type: integer
         required: true
@@ -108,24 +132,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       port_pd02_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_user_data_format:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -551,4 +563,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml
index 0feb8ef..acaaee9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml
@@ -838,9 +838,6 @@ topology_template:
         - get_input:
           - pd_server_names
           - 0
-        port_pd02_port_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_flavor_name:
           get_attribute:
           - network_policy_server
@@ -857,6 +854,11 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        compute_pd_server_user_data_format:
+        - RAW
+        port_pd02_port_mac_requirements:
+          mac_count_required:
+            is_required: false
         port_pd01_port_network:
         - get_attribute:
           - network_policy_server
@@ -869,8 +871,6 @@ topology_template:
             is_required: false
         port_pd02_port_network:
         - get_input: oam_net_name
-        compute_pd_server_user_data_format:
-        - RAW
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -892,4 +892,4 @@ topology_template:
         description: heat template that creates MOG stack
       members:
       - network_policy_server
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
index 3c0aeae..e894e5c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,13 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -28,32 +21,15 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd01_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd02_port_order:
-      type: integer
-      required: true
-    port_pd02_port_subnetpoolid:
-      type: string
-      required: true
     port_pd02_port_network_role_tag:
       type: string
       required: true
     port_pd01_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd02_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     vm_image_name:
       type: string
       required: true
@@ -62,14 +38,58 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_network:
+    port_pd02_port_network_role:
+      type: string
+      required: true
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    compute_pd_server_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd02_port_network_role:
+    port_pd02_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd02_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd02_port_order:
+      type: integer
+      required: true
+    port_pd02_port_subnetpoolid:
       type: string
       required: true
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_pd01_port_order:
       type: integer
       required: true
@@ -90,21 +110,11 @@ topology_template:
     port_pd01_port_network_role_tag:
       type: string
       required: true
-    port_pd01_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd02_port_network:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_user_data_format:
-      type: list
-      required: true
-      entry_schema:
-        type: string
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd02_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd02_port_related_networks
         ip_requirements:
           get_input: port_pd02_port_ip_requirements
         network_role_tag:
@@ -399,4 +413,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd02_port:
       - pd_server_pd02_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3a97da1..dd9ab9a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -24,28 +24,10 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd01_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -58,74 +40,104 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_1_order:
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_1_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port_1_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network_role:
+      port_pd01_port_1_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_0_order:
-        type: integer
+      port_pd01_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_vlan_requirements:
+      port_pd01_port_1_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: string
+      compute_pd_server_user_data_format:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_subnetpoolid:
+        entry_schema:
+          type: string
+      port_pd01_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      vm_image_name:
-        type: string
+      port_pd01_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd01_port_1_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network_role_tag:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd01_port_1_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd01_port_0_vlan_requirements:
+      port_pd01_port_1_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port_0_subnetpoolid:
-        type: string
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd01_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network:
+      port_pd01_port_1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_user_data_format:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd01_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd01_port_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.network.VlanRequirements
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
@@ -551,4 +563,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
index dd26c73..4b300d3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
@@ -101,12 +101,6 @@ topology_template:
           - network_policy_server
           - name
         port_pd01_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_pd01_port_1_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
@@ -122,9 +116,6 @@ topology_template:
           get_attribute:
           - network_policy_server
           - name
-        port_pd01_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_image_name:
           get_input: pd_image_name
         port_pd01_port_1_network_role_tag: oam
@@ -132,6 +123,15 @@ topology_template:
         - get_input: oam_net_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd01_port_1_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_pd01_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -153,4 +153,4 @@ topology_template:
         description: heat template that creates MOG stack
       members:
       - network_policy_server
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
index 0dd90f3..bdf0a31 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -24,24 +24,9 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_0_network_role_tag:
-      type: string
-      required: true
     port_pd01_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -52,46 +37,24 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_1_order:
-      type: integer
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     port_pd01_port_1_network_role:
       type: string
       required: true
     port_pd01_port_0_order:
       type: integer
       required: true
-    port_pd01_port_1_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_pd01_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_pd01_port_1_subnetpoolid:
       type: string
       required: true
     vm_image_name:
       type: string
       required: true
-    port_pd01_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     port_pd01_port_1_network_role_tag:
       type: string
       required: true
-    port_pd01_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd01_port_0_subnetpoolid:
       type: string
       required: true
@@ -105,6 +68,53 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_network_role_tag:
+      type: string
+      required: true
+    port_pd01_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd01_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_1_order:
+      type: integer
+      required: true
+    port_pd01_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd01_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_1_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_1_related_networks
         ip_requirements:
           get_input: port_pd01_port_1_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_0_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_0_related_networks
         ip_requirements:
           get_input: port_pd01_port_0_ip_requirements
         network_role_tag:
@@ -399,4 +413,4 @@ topology_template:
       - link
       link_pd_server_pd01_port_1:
       - pd_server_pd01_port_1
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 530e44c..0bba951 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -24,28 +24,10 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd01_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -58,74 +40,104 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_1_order:
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_1_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port_1_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network_role:
+      port_pd01_port_1_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_0_order:
-        type: integer
+      port_pd01_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_vlan_requirements:
+      port_pd01_port_1_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: string
+      compute_pd_server_user_data_format:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_subnetpoolid:
+        entry_schema:
+          type: string
+      port_pd01_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      vm_image_name:
-        type: string
+      port_pd01_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd01_port_1_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network_role_tag:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd01_port_1_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd01_port_0_vlan_requirements:
+      port_pd01_port_1_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port_0_subnetpoolid:
-        type: string
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd01_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network:
+      port_pd01_port_1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_user_data_format:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd01_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd01_port_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
       pd_server_accessIPv4:
         type: string
@@ -561,4 +573,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml
index 41f9b91..5e52cb5 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml
@@ -838,13 +838,6 @@ topology_template:
         port_pd01_port_0_network:
         - get_input: oam_net_name
         port_pd01_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_pd01_port_0_network_role_tag: oam
-        port_pd01_port_1_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
@@ -858,9 +851,6 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_image_name:
           get_input: pd_image_name
         port_pd01_port_1_network_role_tag: oam
@@ -868,6 +858,16 @@ topology_template:
         - get_input: oam_net_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd01_port_0_network_role_tag: oam
+        port_pd01_port_1_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_pd01_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -907,4 +907,4 @@ topology_template:
       - network_policy_port0
       - network_policy_server
       - network_policy_port1
-      - abstract_pd_server
+      - abstract_pd_server
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 997d59b..4a4f199 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -24,24 +24,9 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_0_network_role_tag:
-      type: string
-      required: true
     port_pd01_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -52,46 +37,24 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_1_order:
-      type: integer
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     port_pd01_port_1_network_role:
       type: string
       required: true
     port_pd01_port_0_order:
       type: integer
       required: true
-    port_pd01_port_1_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_pd01_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_pd01_port_1_subnetpoolid:
       type: string
       required: true
     vm_image_name:
       type: string
       required: true
-    port_pd01_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     port_pd01_port_1_network_role_tag:
       type: string
       required: true
-    port_pd01_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd01_port_0_subnetpoolid:
       type: string
       required: true
@@ -105,6 +68,53 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_network_role_tag:
+      type: string
+      required: true
+    port_pd01_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd01_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_1_order:
+      type: integer
+      required: true
+    port_pd01_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd01_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_1_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_1_related_networks
         ip_requirements:
           get_input: port_pd01_port_1_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_0_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_0_related_networks
         ip_requirements:
           get_input: port_pd01_port_0_ip_requirements
         network_role_tag:
@@ -418,4 +432,4 @@ topology_template:
       - link
       link_pd_server_pd01_port_1:
       - pd_server_pd01_port_1
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 32a7c02..c43947b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -24,28 +24,10 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       port_pd01_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -58,74 +40,104 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_1_order:
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_1_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pd01_port_0_order:
         type: integer
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_pd01_port_1_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+      vm_image_name:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network_role:
+      port_pd01_port_1_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_0_order:
-        type: integer
+      port_pd01_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_vlan_requirements:
+      port_pd01_port_1_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: string
+      compute_pd_server_user_data_format:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_subnetpoolid:
+        entry_schema:
+          type: string
+      port_pd01_port_0_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      vm_image_name:
-        type: string
+      port_pd01_port_0_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd01_port_1_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network_role_tag:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd01_port_1_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd01_port_0_vlan_requirements:
+      port_pd01_port_1_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port_0_subnetpoolid:
-        type: string
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd01_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network:
+      port_pd01_port_1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      compute_pd_server_user_data_format:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd01_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pd01_port_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.network.VlanRequirements
     attributes:
       pd_server_pd01_port_0_device_id:
         type: string
@@ -561,4 +573,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
index d35d65a..9e94e97 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -838,13 +838,6 @@ topology_template:
         port_pd01_port_0_network:
         - get_input: oam_net_name
         port_pd01_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_pd01_port_0_network_role_tag: oam
-        port_pd01_port_1_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
@@ -858,9 +851,6 @@ topology_template:
           - 0
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
         vm_image_name:
           get_input: pd_image_name
         port_pd01_port_1_network_role_tag: oam
@@ -868,6 +858,16 @@ topology_template:
         - get_input: oam_net_name
         compute_pd_server_user_data_format:
         - RAW
+        port_pd01_port_0_network_role_tag: oam
+        port_pd01_port_1_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_pd01_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -902,4 +902,4 @@ topology_template:
       value:
         get_attribute:
         - abstract_pd_server
-        - pd_server_accessIPv4
+        - pd_server_accessIPv4
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 7f9ab67..72e80d7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -24,24 +24,9 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_0_network_role_tag:
-      type: string
-      required: true
     port_pd01_port_0_network_role:
       type: string
       required: true
-    port_pd01_port_1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -52,46 +37,24 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_1_order:
-      type: integer
-      required: true
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     port_pd01_port_1_network_role:
       type: string
       required: true
     port_pd01_port_0_order:
       type: integer
       required: true
-    port_pd01_port_1_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_pd01_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_pd01_port_1_subnetpoolid:
       type: string
       required: true
     vm_image_name:
       type: string
       required: true
-    port_pd01_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     port_pd01_port_1_network_role_tag:
       type: string
       required: true
-    port_pd01_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd01_port_0_subnetpoolid:
       type: string
       required: true
@@ -105,6 +68,53 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_network_role_tag:
+      type: string
+      required: true
+    port_pd01_port_0_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd01_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_1_order:
+      type: integer
+      required: true
+    port_pd01_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd01_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_1_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_1_related_networks
         ip_requirements:
           get_input: port_pd01_port_1_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_0_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_0_related_networks
         ip_requirements:
           get_input: port_pd01_port_0_ip_requirements
         network_role_tag:
@@ -418,4 +432,4 @@ topology_template:
       - link
       link_pd_server_pd01_port_1:
       - pd_server_pd01_port_1
-      - link
+      - link
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2b4345e..6892a54 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -460,6 +466,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -921,6 +933,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -1321,4 +1339,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
index da16719..51e1b21 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
@@ -21,6 +21,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -86,6 +91,10 @@ topology_template:
     oam_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
         security_groups:
           get_input:
           - port_pd01_port_security_groups
@@ -97,12 +106,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -320,4 +327,4 @@ topology_template:
       - local_storage
       dependency_oam_server:
       - oam_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
index c5ea773..f80b26c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -109,6 +114,10 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
         security_groups:
           get_input:
           - port_pd01_port_security_groups
@@ -120,12 +129,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -326,4 +333,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
index e634dcd..72a76e4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
@@ -41,6 +41,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -86,6 +91,10 @@ topology_template:
     ps_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_pd01_port_mac_requirements
+        order:
+          get_input: port_pd01_port_order
         security_groups:
           get_input:
           - port_pd01_port_security_groups
@@ -97,12 +106,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
+        related_networks:
+          get_input: port_pd01_port_related_networks
         network_role_tag:
           get_input: port_pd01_port_network_role_tag
-        mac_requirements:
-          get_input: port_pd01_port_mac_requirements
-        order:
-          get_input: port_pd01_port_order
         network_role:
           get_input: port_pd01_port_network_role
         subnetpoolid:
@@ -326,4 +333,4 @@ topology_template:
       - link
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6f6eb39..26ddce2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -441,6 +447,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -880,6 +892,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -1267,4 +1285,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
index bae9f9e..2893981 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
@@ -21,6 +21,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -81,6 +86,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - local_storage
       dependency_oam_server:
       - oam_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
index 9ce1d48..2d01270 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
index 4012ad4..158f58c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -81,6 +86,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - link
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index abab5c3..1d40ec2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -447,6 +453,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -862,6 +874,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -1255,4 +1273,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml
index 9a5769b..8d7ac38 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -95,6 +100,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -290,4 +297,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
index 61ca45b..402985b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -95,6 +100,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -290,4 +297,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
index 8c0ba00..58900d4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index dd92ac4..a16a063 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -453,6 +459,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -858,18 +870,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_3_order:
-        type: integer
+      port_pd01_port_3_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd01_port_2_vlan_requirements:
         type: list
         required: true
@@ -902,10 +908,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port_3_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
       port_pd01_port_3_network:
         type: list
         required: true
@@ -934,36 +936,58 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_3_vlan_requirements:
+      port_pd01_port_2_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      compute_pd_server_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port_2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: string
+      port_pd01_port_2_ip_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pd01_port_2_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pd01_port_3_order:
+        type: integer
         required: true
         status: SUPPORTED
-      port_pd01_port_3_network_role_tag:
-        type: string
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd01_port_3_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      compute_pd_server_user_data_format:
+      port_pd01_port_2_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_pd01_port_2_ip_requirements:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_pd01_port_3_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd01_port_2_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pd01_port_3_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_3_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -1393,4 +1417,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
index 344d34e..f892137 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
@@ -383,9 +383,6 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_pd01_port_3_mac_requirements:
-          mac_count_required:
-            is_required: false
         port_pd01_port_3_network:
         - get_input: oam_net_name
         vm_image_name:
@@ -395,7 +392,6 @@ topology_template:
         port_pd01_port_2_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pd01_port_3_network_role_tag: oam
         compute_pd_server_user_data_format:
         - RAW
         port_pd01_port_2_ip_requirements:
@@ -404,6 +400,10 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        port_pd01_port_3_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_pd01_port_3_network_role_tag: oam
         service_template_filter:
           substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml
           count: 1
@@ -467,4 +467,4 @@ topology_template:
       - network_policy_server
       - abstract_pd_server
       - abstract_pd_server_1
-      - abstract_pd_server_2
+      - abstract_pd_server_2
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml
index 9ce1d48..2d01270 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
index f875aad..34e182d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
index 2ab72c8..7b93f4a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -17,16 +17,11 @@ topology_template:
     port_pd01_port_3_network_role:
       type: string
       required: true
-    port_pd01_port_3_order:
-      type: integer
+    port_pd01_port_3_related_networks:
+      type: list
       required: true
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd01_port_2_vlan_requirements:
       type: list
       required: true
@@ -53,9 +48,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port_3_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_pd01_port_3_network:
       type: list
       required: true
@@ -78,20 +70,9 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_3_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd01_port_2_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_pd01_port_2_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pd01_port_3_network_role_tag:
-      type: string
-      required: true
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -102,6 +83,35 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_pd01_port_3_order:
+      type: integer
+      required: true
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_3_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pd01_port_2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_pd01_port_3_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_2_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pd01_port_3_network_role_tag:
+      type: string
+      required: true
     port_pd01_port_3_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -133,6 +143,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_2_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_2_related_networks
         ip_requirements:
           get_input: port_pd01_port_2_ip_requirements
         network_role_tag:
@@ -162,6 +174,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_3_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_3_related_networks
         ip_requirements:
           get_input: port_pd01_port_3_ip_requirements
         network_role_tag:
@@ -399,4 +413,4 @@ topology_template:
       - dependency
       dependency_pd_server_pd01_port_3:
       - pd_server_pd01_port_3
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 575f1f3..a7bda34 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -473,6 +479,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps01_port_order:
         type: integer
         required: true
@@ -854,4 +866,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
index 633da82..e0f1093 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -302,4 +309,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
index 0e6bc63..4b513ca 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
@@ -44,6 +44,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps01_port_order:
       type: integer
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_ps01_port_related_networks
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
         network_role_tag:
@@ -302,4 +309,4 @@ topology_template:
       - dependency
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e2792b5..3ee7607 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -469,6 +475,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps01_port_order:
         type: integer
         required: true
@@ -846,4 +858,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
index 9ce1d48..2d01270 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
index 86a0b0d..87be4e0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
@@ -44,6 +44,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps01_port_order:
       type: integer
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_ps01_port_related_networks
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5424d55..2846399 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,6 +12,12 @@ node_types:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
         status: SUPPORTED
+      port_vdbe_untr_vmi_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_vmi_network_role_tag:
         type: string
         required: true
@@ -674,4 +680,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml
index da42733..e4782a5 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs:
       type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
       required: true
+    port_vdbe_untr_vmi_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_vmi_network_role_tag:
       type: string
       required: true
@@ -201,6 +206,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_vmi_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_vmi_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_vmi_virtual_network_refs
@@ -494,4 +501,4 @@ topology_template:
       - dependency
       subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested:
       - vdbe_vdbe_untr_vmi_nested
-      - subinterface_link_vdbe_0_untr_vmi_0
+      - subinterface_link_vdbe_0_untr_vmi_0
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d6eb7f3..61c9922 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -202,6 +202,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
@@ -236,6 +242,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_1_port_virtual_network_refs:
         type: list
         required: true
@@ -1066,4 +1078,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
index eb07f32..99448ab 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
@@ -169,6 +169,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_vlan1_aap_untrusted_ip_prefix:
       type: list
       required: true
@@ -197,6 +202,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_1_port_virtual_network_refs:
       type: list
       required: true
@@ -337,6 +347,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_2_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_2_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_2_port_virtual_network_refs
@@ -540,6 +552,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -814,4 +828,4 @@ topology_template:
       - dependency
       dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1:
       - vdbe_vdbe_untr_1_port_vlan1
-      - dependency_vdbe_untr_x_subport
+      - dependency_vdbe_untr_x_subport
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7287a3e..f9eb9a8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -168,6 +168,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
@@ -924,4 +930,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml
index 32b9a11..6650e3b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml
@@ -142,6 +142,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_vlan1_aap_untrusted_ip_prefix:
       type: list
       required: true
@@ -372,6 +377,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -679,4 +686,4 @@ topology_template:
       - dependency
       dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1:
       - vdbe_vdbe_untr_1_port_vlan1
-      - dependency_vdbe_untr_x_subport
+      - dependency_vdbe_untr_x_subport
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c7b8cd4..1450571 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -198,6 +198,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vdbe_untr_1_subports_ip_v6_address:
         type: list
         required: true
@@ -806,4 +812,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml
index 6cff6fe..ed4effd 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml
@@ -167,6 +167,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_vdbe_untr_1_subports_ip_v6_address:
       type: list
       required: true
@@ -368,6 +373,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -675,4 +682,4 @@ topology_template:
       - dependency_vdbe_untr_x_subport
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fc61996..a11bbd4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -30,6 +30,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_1_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -805,4 +811,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml
index 32820f3..77baf1d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml
@@ -29,6 +29,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -121,6 +126,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -317,4 +324,4 @@ topology_template:
       - link
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c9fd223..0948989 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
@@ -680,4 +686,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
index 41df8db..00f12c2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_nested_service_template_filter_count:
       type: list
       required: true
@@ -286,6 +291,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -497,4 +504,4 @@ topology_template:
       - link
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a97e1c5..ffaaf60 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -26,6 +26,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
@@ -682,4 +688,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml
index f6a589c..c35cfb1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml
@@ -26,6 +26,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_nested_service_template_filter_count:
       type: list
       required: true
@@ -282,6 +287,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -508,4 +515,4 @@ topology_template:
       - link
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ba1e016..613e041 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
@@ -680,4 +686,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml
index b99beeb..04db633 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_nested_service_template_filter_count:
       type: list
       required: true
@@ -287,6 +292,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -498,4 +505,4 @@ topology_template:
       - link
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ed56e94..9a248e4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
@@ -674,4 +680,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml
index ff4be3b..3fb2b04 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_nested_service_template_filter_count:
       type: list
       required: true
@@ -283,6 +288,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -494,4 +501,4 @@ topology_template:
       - link
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 38dc006..7fbaeed 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -168,6 +168,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
@@ -737,6 +743,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_port_ip_requirements:
         type: list
         required: true
@@ -1084,4 +1096,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml
index 044f967..67fb906 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbeServiceTemplate.yaml
@@ -142,6 +142,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_nested1_aap_sec_untrusted_ip_prefix:
       type: list
       required: true
@@ -262,6 +267,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_port_ip_requirements
         network_role_tag:
@@ -472,4 +479,4 @@ topology_template:
       - dependency
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml
index fb2c45b..f3cc404 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/Nested_vdbe_1ServiceTemplate.yaml
@@ -67,6 +67,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_port_ip_requirements:
       type: list
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_vdbe_untr_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - local_storage
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b481f28..8a0a77b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -604,6 +610,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps01_port_order:
         type: integer
         required: true
@@ -1017,4 +1029,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml
index 968bf65..174544b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
       required: true
       entry_schema:
         type: float
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -140,6 +145,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -350,4 +357,4 @@ topology_template:
       - subinterface_link_template_Vlan_1
       dependency_template_Vlan_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - dependency_template_Vlan_1
+      - dependency_template_Vlan_1
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml
index bbe6859..6f92922 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml
@@ -54,6 +54,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_ps01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps01_port_order:
       type: integer
       required: true
@@ -140,6 +145,8 @@ topology_template:
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_ps01_port_related_networks
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
         network_role_tag:
@@ -350,4 +357,4 @@ topology_template:
       - dependency_template_Vlan_1
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9fb2e4e..0924527 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -459,6 +465,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -969,4 +981,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml
index 9ce1d48..2d01270 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml
index 5cedff2..dc53df8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
       required: true
       entry_schema:
         type: float
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -140,6 +145,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -350,4 +357,4 @@ topology_template:
       - dependency_template_Vlan_vmi_1
       subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - subinterface_link_template_Vlan_vmi_1
+      - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b481f28..8a0a77b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -604,6 +610,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps01_port_order:
         type: integer
         required: true
@@ -1017,4 +1029,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml
index 9bf8dac..92f4690 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
       required: true
       entry_schema:
         type: float
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -139,6 +144,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -349,4 +356,4 @@ topology_template:
       - subinterface_link_template_Vlan_1
       dependency_template_Vlan_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - dependency_template_Vlan_1
+      - dependency_template_Vlan_1
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml
index 63bea4a..fa71d6f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml
@@ -54,6 +54,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_ps01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps01_port_order:
       type: integer
       required: true
@@ -139,6 +144,8 @@ topology_template:
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_ps01_port_related_networks
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
         network_role_tag:
@@ -349,4 +356,4 @@ topology_template:
       - dependency_template_Vlan_1
       local_storage_ps_server:
       - ps_server
-      - local_storage
+      - local_storage
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 06c4052..aea3320 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -54,6 +54,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_ps01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps01_port_order:
         type: integer
         required: true
@@ -507,6 +513,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -1017,4 +1029,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml
index b18f761..4ffb746 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml
@@ -49,6 +49,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_ps01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps01_port_order:
       type: integer
       required: true
@@ -121,6 +126,8 @@ topology_template:
         vlan_requirements:
           get_input: port_ps01_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_ps01_port_related_networks
         ip_requirements:
           get_input: port_ps01_port_ip_requirements
         network_role_tag:
@@ -350,4 +357,4 @@ topology_template:
       - subinterface_link_template_Vlan_vmi_1
       dependency_pd_server_ps01_port_nested:
       - pd_server_ps01_port_nested
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml
index 5cedff2..dc53df8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
       required: true
       entry_schema:
         type: float
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -140,6 +145,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -350,4 +357,4 @@ topology_template:
       - dependency_template_Vlan_vmi_1
       subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - subinterface_link_template_Vlan_vmi_1
+      - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9fb2e4e..0924527 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -459,6 +465,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -969,4 +981,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml
index 9ce1d48..2d01270 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
     port_pd01_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -100,6 +105,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -295,4 +302,4 @@ topology_template:
       - dependency
       dependency_pd_server:
       - pd_server
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml
index 5cedff2..dc53df8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
       required: true
       entry_schema:
         type: float
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -140,6 +145,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -350,4 +357,4 @@ topology_template:
       - dependency_template_Vlan_vmi_1
       subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - subinterface_link_template_Vlan_vmi_1
+      - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fb71536..b7b6ef9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -14,12 +14,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vlan1_ip_v6_address:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       subinterface_vlan1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
@@ -32,12 +26,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vlan1_aap_untrusted_ip_prefix:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
         type: list
         required: true
@@ -52,38 +40,16 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_vdbe_untr_2_port_virtual_network_refs:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
       subinterface_vlan1_counter:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: float
-      subinterface_vlan1_subinterfaces_name_prefix:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_vdbe_untr_1_port_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vdbe_untr_2_port_name:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       port_vdbe_untr_2_port_network_role:
         type: string
         required: true
@@ -100,12 +66,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_1_port_virtual_network_refs:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
       port_vdbe_untr_1_port_ip_requirements:
         type: list
         required: true
@@ -122,130 +82,182 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      subinterface_vlan1_vn_network_list:
+      port_vdbe_untr_2_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_vdbe_untr_2_port_subnetpoolid:
-        type: string
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_vdbe_untr_1_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_vdbe_untr_2_port_order:
+      port_vdbe_untr_1_port_order:
         type: integer
         required: true
         status: SUPPORTED
-      subinterface_vlan1_service_template_filter_count:
+      port_vdbe_untr_1_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_2_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
+        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+        required: true
+        status: SUPPORTED
+      subinterface_vlan1_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: float
-      port_vdbe_untr_2_port_ip_requirements:
+          type: string
+      subinterface_vlan1_aap_untrusted_ip_prefix_len:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_vdbe_untr_1_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: string
+      subinterface_vlan1_ip_address:
+        type: list
         required: true
         status: SUPPORTED
-      port_vdbe_untr_1_port_order:
-        type: integer
+        entry_schema:
+          type: string
+      compute_vdbe_name:
+        type: list
         required: true
         status: SUPPORTED
-      subinterface_vlan1_parent_interface:
+        entry_schema:
+          type: string
+      port_vdbe_untr_1_port_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      subinterface_vlan1_ip_v6_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vlan1_aap_address_mode:
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_vdbe_untr_2_port_virtual_network_refs:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_vdbe_untr_1_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: json
+      subinterface_vlan1_subinterfaces_name_prefix:
+        type: list
         required: true
         status: SUPPORTED
-      port_vdbe_untr_1_port_subnetpoolid:
+        entry_schema:
+          type: string
+      port_vdbe_untr_1_port_network_role:
         type: string
         required: true
         status: SUPPORTED
-      subinterface_vlan1_optional_property_1:
+      port_vdbe_untr_2_port_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_1_port_name:
+      port_vdbe_untr_2_port_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_vdbe_untr_2_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_vdbe_untr_1_port_virtual_network_refs:
+        type: list
         required: true
         status: SUPPORTED
-      subinterface_vlan1_optional_property_2:
+        entry_schema:
+          type: json
+      subinterface_vlan1_vn_network_list:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
-        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+      port_vdbe_untr_2_port_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
+      port_vdbe_untr_2_port_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      subinterface_vlan1_service_template_filter_count:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: float
+      subinterface_vlan1_parent_interface:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vlan1_mac_address:
+      subinterface_vlan1_aap_address_mode:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vlan1_aap_untrusted_ip_prefix_len:
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_vdbe_untr_1_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      subinterface_vlan1_optional_property_1:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vlan1_ip_address:
+      port_vdbe_untr_1_port_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
-        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+      subinterface_vlan1_optional_property_2:
+        type: list
         required: true
         status: SUPPORTED
-      compute_vdbe_name:
+        entry_schema:
+          type: string
+      subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_1_port_network_role_tag:
-        type: string
+      port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
+        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
         status: SUPPORTED
       port_vdbe_untr_1_port_vlan_requirements:
@@ -837,4 +849,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
index 9b01aa7..70051fa 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml
@@ -471,49 +471,22 @@ topology_template:
         subinterface_vlan1_aap_untrusted_v6_ip_prefix:
         - get_input: vdbe_aap_untrusted_v6_ip_prefix
         - get_input: vdbe_aap_untrusted_v6_ip_prefix
-        subinterface_vlan1_ip_v6_address:
-        - get_input: vdbe_untrusted_v6_ip_1
-        - get_input: vdbe_untrusted_v6_ip_1
         subinterface_vlan1_aap_sec_untrusted_ip_prefix:
         - get_input: vdbe_aap_sec_untrusted_ip_prefix
         - get_input: vdbe_aap_sec_untrusted_ip_prefix
         compute_vdbe_availability_zone:
         - get_input: availability_zone_1
         - get_input: availability_zone_1
-        subinterface_vlan1_aap_untrusted_ip_prefix:
-        - get_input: vdbe_aap_untrusted_ip_prefix
-        - get_input: vdbe_aap_untrusted_ip_prefix
         port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
         - - get_input: vdbe_hw_untr_mac_1
         - - get_input: vdbe_hw_untr_mac_1
         vm_flavor_name:
           get_input: vdbe_flavor_name
-        port_vdbe_untr_2_port_virtual_network_refs:
-        - - fabric_int_net
-        - - fabric_int_net
         subinterface_vlan1_counter:
         - get_input: counter
         - get_input: counter
-        subinterface_vlan1_subinterfaces_name_prefix:
-        - str_replace:
-            template: VM_NAMEDBE001p1n004
-            params:
-              DBE:
-                get_input: vdbe_device_name
-              VM_NAME:
-                get_input: vdbe_name_1
-        - str_replace:
-            template: VM_NAMEDBE001p1n004
-            params:
-              DBE:
-                get_input: vdbe_device_name
-              VM_NAME:
-                get_input: vdbe_name_1
         vm_image_name:
           get_input: vdbe_image_name
-        port_vdbe_untr_2_port_name:
-        - Port_2
-        - Port_4
         compute_vdbe_metadata:
         - vf_module_id:
             get_input: vf_module_id
@@ -530,6 +503,45 @@ topology_template:
         subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
         - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
         - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
+        subinterface_vlan1_mac_address:
+        - get_input: vdbe_hw_untr_mac_1
+        - get_input: vdbe_hw_untr_mac_1
+        subinterface_vlan1_aap_untrusted_ip_prefix_len:
+        - get_input: vdbe_aap_untrusted_ip_prefix_len
+        - get_input: vdbe_aap_untrusted_ip_prefix_len
+        subinterface_vlan1_ip_address:
+        - get_input: vdbe_untrusted_ip_1
+        - get_input: vdbe_untrusted_ip_1
+        compute_vdbe_name:
+        - get_input: vdbe_name_1
+        - get_input: vdbe_name_1
+        subinterface_vlan1_ip_v6_address:
+        - get_input: vdbe_untrusted_v6_ip_1
+        - get_input: vdbe_untrusted_v6_ip_1
+        subinterface_vlan1_aap_untrusted_ip_prefix:
+        - get_input: vdbe_aap_untrusted_ip_prefix
+        - get_input: vdbe_aap_untrusted_ip_prefix
+        port_vdbe_untr_2_port_virtual_network_refs:
+        - - fabric_int_net
+        - - fabric_int_net
+        subinterface_vlan1_subinterfaces_name_prefix:
+        - str_replace:
+            template: VM_NAMEDBE001p1n004
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
+        - str_replace:
+            template: VM_NAMEDBE001p1n004
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
+        port_vdbe_untr_2_port_name:
+        - Port_2
+        - Port_4
         port_vdbe_untr_1_port_virtual_network_refs:
         - - control_int_net
         - - control_int_net
@@ -569,18 +581,6 @@ topology_template:
         subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
         - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
         - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
-        subinterface_vlan1_mac_address:
-        - get_input: vdbe_hw_untr_mac_1
-        - get_input: vdbe_hw_untr_mac_1
-        subinterface_vlan1_aap_untrusted_ip_prefix_len:
-        - get_input: vdbe_aap_untrusted_ip_prefix_len
-        - get_input: vdbe_aap_untrusted_ip_prefix_len
-        subinterface_vlan1_ip_address:
-        - get_input: vdbe_untrusted_ip_1
-        - get_input: vdbe_untrusted_ip_1
-        compute_vdbe_name:
-        - get_input: vdbe_name_1
-        - get_input: vdbe_name_1
         port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
         - - get_input: vdbe_hw_untr_mac_1
         - - get_input: vdbe_hw_untr_mac_1

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml
index 13006c7..3b803ba 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml
@@ -16,11 +16,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    subinterface_vlan1_ip_v6_address:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     subinterface_vlan1_aap_sec_untrusted_ip_prefix:
       type: list
       required: true
@@ -31,11 +26,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    subinterface_vlan1_aap_untrusted_ip_prefix:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses:
       type: list
       required: true
@@ -47,63 +37,126 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_vdbe_untr_2_port_virtual_network_refs:
+    subinterface_vlan1_counter:
       type: list
       required: true
       entry_schema:
-        type: json
-    subinterface_vlan1_counter:
+        type: float
+    vm_image_name:
+      type: string
+      required: true
+    port_vdbe_untr_2_port_network_role:
+      type: string
+      required: true
+    compute_vdbe_metadata:
       type: list
       required: true
       entry_schema:
-        type: float
-    subinterface_vlan1_subinterfaces_name_prefix:
+        type: json
+    subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
+    port_vdbe_untr_1_port_ip_requirements:
+      type: list
       required: true
-    port_vdbe_untr_1_port_network_role:
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_vdbe_untr_2_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_vdbe_untr_2_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_vdbe_untr_2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_vdbe_untr_1_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_vdbe_untr_1_port_order:
+      type: integer
+      required: true
+    port_vdbe_untr_1_port_subnetpoolid:
       type: string
       required: true
-    port_vdbe_untr_2_port_name:
+    port_vdbe_untr_2_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
+      type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+      required: true
+    subinterface_vlan1_mac_address:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_2_port_network_role:
+    subinterface_vlan1_aap_untrusted_ip_prefix_len:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    subinterface_vlan1_ip_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_vdbe_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_vdbe_untr_1_port_network_role_tag:
       type: string
       required: true
-    compute_vdbe_metadata:
+    subinterface_vlan1_ip_v6_address:
       type: list
       required: true
       entry_schema:
-        type: json
-    subinterface_vlan1_aap_untrusted_v6_ip_prefix_len:
+        type: string
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    subinterface_vlan1_aap_untrusted_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_1_port_virtual_network_refs:
+    port_vdbe_untr_2_port_virtual_network_refs:
       type: list
       required: true
       entry_schema:
         type: json
-    port_vdbe_untr_1_port_ip_requirements:
+    subinterface_vlan1_subinterfaces_name_prefix:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_vdbe_untr_2_port_vlan_requirements:
+        type: string
+    port_vdbe_untr_1_port_network_role:
+      type: string
+      required: true
+    port_vdbe_untr_2_port_name:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_vdbe_untr_2_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+        type: string
+    port_vdbe_untr_2_port_related_networks:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_vdbe_untr_1_port_virtual_network_refs:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     subinterface_vlan1_vn_network_list:
       type: list
       required: true
@@ -120,17 +173,6 @@ topology_template:
       required: true
       entry_schema:
         type: float
-    port_vdbe_untr_2_port_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_vdbe_untr_1_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_vdbe_untr_1_port_order:
-      type: integer
-      required: true
     subinterface_vlan1_parent_interface:
       type: list
       required: true
@@ -151,9 +193,6 @@ topology_template:
     port_vdbe_untr_1_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_vdbe_untr_1_port_subnetpoolid:
-      type: string
-      required: true
     subinterface_vlan1_optional_property_1:
       type: list
       required: true
@@ -164,48 +203,19 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_2_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     subinterface_vlan1_optional_property_2:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
-      type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
-      required: true
     subinterface_vlan1_aap_sec_untrusted_ip_prefix_len:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vlan1_mac_address:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    subinterface_vlan1_aap_untrusted_ip_prefix_len:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    subinterface_vlan1_ip_address:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs:
       type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
       required: true
-    compute_vdbe_name:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_vdbe_untr_1_port_network_role_tag:
-      type: string
-      required: true
     port_vdbe_untr_1_port_vlan_requirements:
       type: list
       required: true
@@ -257,6 +267,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_vdbe_untr_2_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_2_port_virtual_network_refs
@@ -387,6 +399,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -644,4 +658,4 @@ topology_template:
       - dependency
       subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
       - vdbe_vdbe_untr_1_port_vlan1
-      - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
+      - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 33bfc08..51a1003 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -12,6 +12,12 @@ node_types:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
         status: SUPPORTED
+      port_vdbe_untr_vmi_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vlan1_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
@@ -346,6 +352,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_oam_vmi_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_vmi_vlan_requirements:
         type: list
         required: true
@@ -1061,4 +1073,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
index 02a12c7..196ba8f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs:
       type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
       required: true
+    port_vdbe_untr_vmi_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_vlan1_aap_untrusted_v6_ip_prefix:
       type: list
       required: true
@@ -288,6 +293,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_oam_vmi_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_vmi_vlan_requirements:
       type: list
       required: true
@@ -418,6 +428,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_vmi_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_vmi_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_vmi_virtual_network_refs
@@ -459,6 +471,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_oam_vmi_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_oam_vmi_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_oam_vmi_virtual_network_refs
@@ -805,4 +819,4 @@ topology_template:
       - dependency_vdbe_1_subint_oam_vmi_1
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 996cafa..f1fc7d9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -196,6 +196,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_port_ip_requirements:
         type: list
         required: true
@@ -680,4 +686,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml
index 589a662..1e55c60 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml
@@ -165,6 +165,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_port_ip_requirements:
       type: list
       required: true
@@ -206,6 +211,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_port_virtual_network_refs
@@ -498,4 +505,4 @@ topology_template:
       - dependency
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f81ad1f..8f31c10 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -148,6 +148,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vlan1_aap_untrusted_ip_prefix:
         type: list
         required: true
@@ -176,6 +182,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_1_port_virtual_network_refs:
         type: list
         required: true
@@ -839,4 +851,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml
index b8e1dc1..4fac95a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml
@@ -124,6 +124,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_vlan1_aap_untrusted_ip_prefix:
       type: list
       required: true
@@ -147,6 +152,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_1_port_virtual_network_refs:
       type: list
       required: true
@@ -262,6 +272,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_2_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_vdbe_untr_2_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_2_port_virtual_network_refs
@@ -392,6 +404,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -642,4 +656,4 @@ topology_template:
       - dependency
       subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1:
       - vdbe_vdbe_untr_1_port_vlan1
-      - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
+      - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 042ae71..27074c4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -208,6 +208,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_port_ip_requirements:
         type: list
         required: true
@@ -702,4 +708,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
index db916c6..c25df79 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml
@@ -175,6 +175,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_port_ip_requirements:
       type: list
       required: true
@@ -216,6 +221,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_port_virtual_network_refs
@@ -515,4 +522,4 @@ topology_template:
       - dependency
       dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested:
       - vdbe_vdbe_untr_port_nested
-      - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport
+      - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml
index feff997..3e2ef2c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -548,4 +554,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml
index e33f3ba..80a1b10 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
       required: true
       entry_schema:
         type: float
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -140,6 +145,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -350,4 +357,4 @@ topology_template:
       - dependency_template_Vlan_vmi_1
       subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - subinterface_link_template_Vlan_vmi_1
+      - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index feff997..3e2ef2c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,6 +38,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: float
+      port_pd01_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vm_flavor_name:
         type: string
         required: true
@@ -548,4 +554,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index e33f3ba..80a1b10 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
       required: true
       entry_schema:
         type: float
+    port_pd01_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vm_flavor_name:
       type: string
       required: true
@@ -140,6 +145,8 @@ topology_template:
         vlan_requirements:
           get_input: port_pd01_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_pd01_port_related_networks
         ip_requirements:
           get_input: port_pd01_port_ip_requirements
         network_role_tag:
@@ -350,4 +357,4 @@ topology_template:
       - dependency_template_Vlan_vmi_1
       subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested:
       - pd_server_pd01_port_nested
-      - subinterface_link_template_Vlan_vmi_1
+      - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c9fd223..0948989 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -32,6 +32,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested_service_template_filter_count:
         type: list
         required: true
@@ -680,4 +686,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml
index c3b0f08..39bf635 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_nested_service_template_filter_count:
       type: list
       required: true
@@ -287,6 +292,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_1_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_1_port_virtual_network_refs
@@ -498,4 +505,4 @@ topology_template:
       - link
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6d4ef6a..38f116d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -28,6 +28,12 @@ node_types:
         description: Unique name for this VF instance
         required: true
         status: SUPPORTED
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
@@ -696,4 +702,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml
index 010d46b..a284519 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF instance
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vdbe_untrusted_ip_1:
       hidden: false
       immutable: false
@@ -216,6 +221,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vdbe_untr_1_port_subnetpoolid
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_1_port_ip_requirements
         network_role:
@@ -555,4 +562,4 @@ topology_template:
       - subinterface_link_vdbe_untr_x_subport
       dependency_vdbe_untr_1_subports:
       - vdbe_untr_1_subports
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 85193db..2edf12d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -253,6 +253,12 @@ node_types:
         description: Unique name for this VF instance
         required: true
         status: SUPPORTED
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
@@ -292,6 +298,12 @@ node_types:
         description: Unique ID for this VF inst
         required: true
         status: SUPPORTED
+      port_vdbe_untr_2_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_name_1:
         type: string
         description: VM Name for this vdbe node 1
@@ -992,4 +1004,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml
index bd7ee9a..0287af0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml
@@ -133,6 +133,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF instance
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vdbe_untrusted_ip_1:
       hidden: false
       immutable: false
@@ -171,6 +176,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique ID for this VF inst
+    port_vdbe_untr_2_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vdbe_name_1:
       hidden: false
       immutable: false
@@ -334,6 +344,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vdbe_untr_1_port_subnetpoolid
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_1_port_ip_requirements
         network_role:
@@ -467,6 +479,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vdbe_untr_2_port_subnetpoolid
+        related_networks:
+          get_input: port_vdbe_untr_2_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_2_port_ip_requirements
         network_role:
@@ -801,4 +815,4 @@ topology_template:
       - subinterface_link_vdbe_untr_x_subport
       dependency_vdbe_untr_1_subports:
       - vdbe_untr_1_subports
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8c18eb8..6b3a3e4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -140,6 +140,12 @@ node_types:
         description: Unique name for this VF instance
         required: true
         status: SUPPORTED
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
@@ -843,4 +849,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml
index 196ba3e..bb53dfc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF instance
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vdbe_untrusted_ip_1:
       hidden: false
       immutable: false
@@ -272,6 +277,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vdbe_untr_1_port_subnetpoolid
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_1_port_ip_requirements
         network_role:
@@ -624,4 +631,4 @@ topology_template:
       - subinterface_link_vdbe_untr_x_subport
       dependency_vdbe_untr_1_subports:
       - vdbe_untr_1_subports
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2e140ac..0c815e4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -28,6 +28,12 @@ node_types:
         description: Unique name for this VF instance
         required: true
         status: SUPPORTED
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
@@ -731,4 +737,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml
index 933474c..f17a7b9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF instance
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vdbe_untrusted_ip_1:
       hidden: false
       immutable: false
@@ -272,6 +277,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vdbe_untr_1_port_subnetpoolid
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_1_port_ip_requirements
         network_role:
@@ -627,4 +634,4 @@ topology_template:
       - subinterface_link_vdbe_untr_x_subport
       dependency_vdbe_untr_1_subports:
       - vdbe_untr_1_subports
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cc77985..785d543 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -28,6 +28,12 @@ node_types:
         description: Unique name for this VF instance
         required: true
         status: SUPPORTED
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
@@ -696,4 +702,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml
index 7ca9a56..82ef0ae 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF instance
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vdbe_untrusted_ip_1:
       hidden: false
       immutable: false
@@ -216,6 +221,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vdbe_untr_1_port_subnetpoolid
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_1_port_ip_requirements
         network_role:
@@ -548,4 +555,4 @@ topology_template:
       - subinterface_link_vdbe_untr_x_subport
       dependency_vdbe_untr_1_subports:
       - vdbe_untr_1_subports
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 60cbbcf..e7b83eb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -33,6 +33,12 @@ node_types:
         description: Unique name for this VF instance
         required: true
         status: SUPPORTED
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
@@ -746,4 +752,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml
index f41111d..79dea6d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF instance
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vdbe_untrusted_ip_1:
       hidden: false
       immutable: false
@@ -252,6 +257,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vdbe_untr_1_port_subnetpoolid
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_1_port_ip_requirements
         network_role:
@@ -613,4 +620,4 @@ topology_template:
       - dependency
       dependency_vdbe_untr_1_subports:
       - vdbe_untr_1_subports
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 15e649a..7a3f7be 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -33,6 +33,12 @@ node_types:
         description: Unique name for this VF instance
         required: true
         status: SUPPORTED
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
@@ -741,4 +747,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml
index 17f8e6b..389858c 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml
@@ -36,6 +36,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF instance
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vdbe_untrusted_ip_1:
       hidden: false
       immutable: false
@@ -249,6 +254,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vdbe_untr_1_port_subnetpoolid
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_1_port_ip_requirements
         network_role:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5d10b6a..0f1d7a4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -28,6 +28,12 @@ node_types:
         description: Unique name for this VF instance
         required: true
         status: SUPPORTED
+      port_vdbe_untr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       vdbe_untrusted_ip_1:
         type: string
         description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
@@ -690,4 +696,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
index 0b9a7a2..0868a76 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF instance
+    port_vdbe_untr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     vdbe_untrusted_ip_1:
       hidden: false
       immutable: false
@@ -216,6 +221,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vdbe_untr_1_port_subnetpoolid
+        related_networks:
+          get_input: port_vdbe_untr_1_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_1_port_ip_requirements
         network_role:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6276836..ad64e97 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1049,6 +1049,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_2b_port_network_role_tag:
         type: string
         required: true
@@ -1157,6 +1163,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_2b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_order:
         type: integer
         required: true
@@ -1654,6 +1666,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -1706,6 +1724,12 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
+      port_ps_server_2b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_2b_port_order:
         type: integer
         required: true
@@ -2252,4 +2276,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 1904d92..86814d7 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -42,6 +42,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_2b_port_network_role_tag:
       type: string
       required: true
@@ -129,6 +134,11 @@ topology_template:
     port_pd_server_2b_port_subnetpoolid:
       type: string
       required: true
+    port_pd_server_2b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_order:
       type: integer
       required: true
@@ -154,6 +164,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_2b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_2b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_2b_port_network_role_tag
         network_role:
@@ -231,6 +243,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -481,4 +495,4 @@ topology_template:
       - link
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index 0d17953..ddc05d1 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -35,6 +35,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_1b_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -77,6 +82,11 @@ topology_template:
     port_ps_server_1b_port_order:
       type: integer
       required: true
+    port_ps_server_2b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_2b_port_order:
       type: integer
       required: true
@@ -154,6 +164,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_1b_port_network_role_tag
         network_role:
@@ -191,6 +203,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_2b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_2b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_2b_port_network_role_tag
         network_role:
@@ -426,4 +440,4 @@ topology_template:
       - dependency
       dependency_ps_server_1b:
       - ps_server_1b
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a80a91c..de35f91 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -942,6 +942,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -1385,6 +1391,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ps_server_1b_ips:
         type: string
         required: true
@@ -1954,4 +1966,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 40cf56b..17f0ff0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -41,6 +41,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - subinterface_link_template_Vlan_vmi_1
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 0f22120..a278443 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_ps_server_1b_port_1_network_role_tag:
       type: string
       required: true
+    port_ps_server_1b_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     ps_server_1b_ips:
       hidden: false
       immutable: false
@@ -134,6 +139,11 @@ topology_template:
     ps_server_1b_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_ps_server_1b_port_1_subnetpoolid
+        related_networks:
+          get_input: port_ps_server_1b_port_1_related_networks
+        network: packet_int_network
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_ps_server_1b_port_1_ip_requirements
@@ -144,8 +154,6 @@ topology_template:
             get_input:
             - ps_server_1b_ips
             - 0
-        subnetpoolid:
-          get_input: port_ps_server_1b_port_1_subnetpoolid
         mac_requirements:
           get_input: port_ps_server_1b_port_1_mac_requirements
         subinterface_indicator: true
@@ -155,7 +163,6 @@ topology_template:
           get_input: port_ps_server_1b_port_1_vlan_requirements
         network_role_tag:
           get_input: port_ps_server_1b_port_1_network_role_tag
-        network: packet_int_network
         order:
           get_input: port_ps_server_1b_port_1_order
       requirements:
@@ -402,4 +409,4 @@ topology_template:
       - dependency_template_Vlan_vmi_1
       dependency_server_1b_ps_1:
       - server_1b_ps_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 19ea2cd..1fe62b6 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1300,6 +1300,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -2613,6 +2619,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
@@ -3109,4 +3121,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 40cf56b..17f0ff0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -41,6 +41,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - subinterface_link_template_Vlan_vmi_1
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index b7e7e4a..2cdd4ed 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -45,6 +45,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_1b_port_network:
       type: list
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - link
       dependency_ps_server_1b:
       - ps_server_1b
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d7df807..bd9cb40 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -873,6 +873,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -1330,6 +1336,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_pd_server_1b_port_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       ps_server_1b_ips:
         type: string
         required: true
@@ -1858,4 +1870,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 40cf56b..17f0ff0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -41,6 +41,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - subinterface_link_template_Vlan_vmi_1
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index e415457..4f11d4d 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -25,6 +25,11 @@ topology_template:
     port_pd_server_1b_port_1_subnetpoolid:
       type: string
       required: true
+    port_pd_server_1b_port_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     ps_server_1b_ips:
       hidden: false
       immutable: false
@@ -133,6 +138,12 @@ topology_template:
     pd_server_1b_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_pd_server_1b_port_1_subnetpoolid
+        related_networks:
+          get_input: port_pd_server_1b_port_1_related_networks
+        network:
+          get_input: port_net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_pd_server_1b_port_1_ip_requirements
@@ -143,8 +154,6 @@ topology_template:
             get_input:
             - pd_server_1b_ips
             - 0
-        subnetpoolid:
-          get_input: port_pd_server_1b_port_1_subnetpoolid
         mac_requirements:
           get_input: port_pd_server_1b_port_1_mac_requirements
         subinterface_indicator: true
@@ -154,8 +163,6 @@ topology_template:
           get_input: port_pd_server_1b_port_1_vlan_requirements
         network_role_tag:
           get_input: port_pd_server_1b_port_1_network_role_tag
-        network:
-          get_input: port_net
         order:
           get_input: port_pd_server_1b_port_1_order
       requirements:
@@ -375,4 +382,4 @@ topology_template:
       - dependency
       dependency_pd_server_1b_port_1:
       - pd_server_1b_port_1
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e4265b8..5a6cedc 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -44,6 +44,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -2028,6 +2034,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -2473,6 +2485,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
@@ -2969,4 +2987,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index c3bad7c..d092114 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -31,6 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml
index eba7e8b..9920d7e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml
@@ -41,6 +41,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - subinterface_link_template_Vlan_vmi_1
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index b7e7e4a..2cdd4ed 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -45,6 +45,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_1b_port_network:
       type: list
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - link
       dependency_ps_server_1b:
       - ps_server_1b
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 12b12ab..eba8068 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -903,6 +903,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -1405,4 +1411,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 40cf56b..17f0ff0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -41,6 +41,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - subinterface_link_template_Vlan_vmi_1
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 594f24d..fcbfe72 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1276,6 +1276,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -2559,6 +2565,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
@@ -2992,6 +3004,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
@@ -3488,4 +3506,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 40cf56b..17f0ff0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -41,6 +41,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - subinterface_link_template_Vlan_vmi_1
       dependency_pd_server_1b_pd_server_1b_port:
       - pd_server_1b_pd_server_1b_port
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index b7e7e4a..2cdd4ed 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -45,6 +45,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_1b_port_network:
       type: list
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - link
       dependency_ps_server_1b:
       - ps_server_1b
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml
index 27604b5..258a426 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml
@@ -40,6 +40,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_1b_port_network:
       type: list
       required: true
@@ -111,6 +116,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_1b_port_network_role_tag
         network_role:
@@ -304,4 +311,4 @@ topology_template:
       - link
       dependency_ps_server_1b:
       - ps_server_1b
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fcb2bb1..519a0da 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1300,6 +1300,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_pd_server_1b_port_network_role_tag:
         type: string
         required: true
@@ -2613,6 +2619,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_ps_server_1b_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_ps_server_1b_port_network:
         type: list
         required: true
@@ -3109,4 +3121,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index aecb447..aade6f5 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -41,6 +41,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_pd_server_1b_port_network_role_tag:
       type: string
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_pd_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_pd_server_1b_port_related_networks
         network_role_tag:
           get_input: port_pd_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - dependency
       dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
       - pd_server_1b_pd_server_1b_port_nested_vlan
-      - dependency_template_subint_Vlan_vmi_1
+      - dependency_template_subint_Vlan_vmi_1
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index aa2205a..1e89da0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -45,6 +45,11 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
+    port_ps_server_1b_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_ps_server_1b_port_network:
       type: list
       required: true
@@ -151,6 +156,8 @@ topology_template:
         subinterface_indicator: true
         ip_requirements:
           get_input: port_ps_server_1b_port_ip_requirements
+        related_networks:
+          get_input: port_ps_server_1b_port_related_networks
         network_role_tag:
           get_input: port_ps_server_1b_port_network_role_tag
         network_role:
@@ -359,4 +366,4 @@ topology_template:
       - subinterface_link_template_subint_Vlan_vmi_1
       dependency_ps_server_1b:
       - ps_server_1b
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 65df449..43ce925 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,22 +18,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_vdbe_untr_port_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
@@ -78,12 +62,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vdbe_untr_1_subports_ip_v6_address:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix:
         type: list
         required: true
@@ -134,154 +112,182 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_vdbe_untr_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      subinterface_vdbe_untr_1_subports_vn_network_list:
+        type: list
         required: true
         status: SUPPORTED
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+        entry_schema:
+          type: string
+      port_vdbe_untr_port_name:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      subinterface_vdbe_untr_1_subports_parent_interface:
+        entry_schema:
+          type: string
+      port_vdbe_untr_port_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      subinterface_vdbe_untr_2_subports_vn_network_list:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vdbe_untr_2_subports_service_template_filter_count:
+      subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: float
-      subinterface_vdbe_untr_1_subports_service_template_filter_count:
+          type: string
+      subinterface_vdbe_untr_2_subports_ip_v6_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: float
-      subinterface_vdbe_untr_1_subports_vn_network_list:
+          type: string
+      subinterface_vdbe_untr_2_subports_mac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_port_name:
+      subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_port_vlan_requirements:
+      compute_vdbe_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      subinterface_vdbe_untr_2_subports_ip_address:
+          type: string
+      subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_port_network_role:
-        type: string
+      port_vdbe_untr_port_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      subinterface_vdbe_untr_1_subports_vmac_address:
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
+      port_vdbe_untr_port_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      subinterface_vdbe_untr_2_subports_vn_network_list:
+          type: org.openecomp.datatypes.network.IpRequirements
+      subinterface_vdbe_untr_1_subports_vlan_tag_list:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
+          type: json
+      subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
+      subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vdbe_untr_2_subports_ip_v6_address:
+      port_vdbe_untr_port_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      subinterface_vdbe_untr_1_subports_ip_v6_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vdbe_untr_2_subports_mac_address:
+      port_vdbe_untr_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      subinterface_vdbe_untr_1_subports_parent_interface:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
+      subinterface_vdbe_untr_2_subports_service_template_filter_count:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
+          type: float
+      subinterface_vdbe_untr_1_subports_service_template_filter_count:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      subinterface_vdbe_untr_2_subports_parent_interface:
+          type: float
+      port_vdbe_untr_port_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      subinterface_vdbe_untr_2_subports_ip_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_vdbe_name:
+      subinterface_vdbe_untr_1_subports_vmac_address:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
+      subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
+      subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_vdbe_untr_port_ip_requirements:
+      subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      subinterface_vdbe_untr_1_subports_vlan_tag_list:
+          type: string
+      subinterface_vdbe_untr_2_subports_parent_interface:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
     requirements:
     - dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports:
         capability: tosca.capabilities.Node
@@ -795,4 +801,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml
index 9f69438..32ad867 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml
@@ -416,10 +416,6 @@ topology_template:
       properties:
         subinterface_vdbe_untr_1_subports_ip_address:
         - get_input: vdbe_untrusted_ip_1
-        subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
-        - get_input: vdbe_aap_untrusted_ip_prefix
-        subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
-        - get_input: vdbe_aap_untrusted_ip_prefix
         subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix:
         - get_input: vdbe_aap_sec_untrusted_ip_prefix
         subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix:
@@ -434,8 +430,6 @@ topology_template:
         - get_input: vdbe_aap_untrusted_ip_prefix_len
         subinterface_vdbe_untr_1_subports_mac_address:
         - get_input: vdbe_hw_untr_mac_1
-        subinterface_vdbe_untr_1_subports_ip_v6_address:
-        - get_input: vdbe_untrusted_v6_ip_1
         subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix:
         - str_replace:
             template: VM_NAMEDBE001p1n004
@@ -463,30 +457,9 @@ topology_template:
         - get_input: aap_address_mode
         subinterface_vdbe_untr_2_subports_vlan_tag_list:
         - get_input: untrusted_vlan_tags
-        port_vdbe_untr_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        subinterface_vdbe_untr_1_subports_parent_interface:
-        - vdbe_1_untr_port_1
-        subinterface_vdbe_untr_2_subports_service_template_filter_count:
-        - 5
-        subinterface_vdbe_untr_1_subports_service_template_filter_count:
-        - get_input: untrusted_num_vn
         subinterface_vdbe_untr_1_subports_vn_network_list:
         - get_input: untrusted_vn_networks
         port_vdbe_untr_port_name:
-        - str_replace:
-            template: VM_NAMEDBE001p1n004
-            params:
-              DBE:
-                get_input: vdbe_device_name
-              VM_NAME:
-                get_input: vdbe_name_1
-        subinterface_vdbe_untr_2_subports_ip_address:
-        - get_input: vdbe_untrusted_ip_1
-        subinterface_vdbe_untr_1_subports_vmac_address:
-        - get_input: vdbe_untrusted_vmac_address
-        subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
         - str_replace:
             template: VM_NAMEDBE001p1n004
             params:
@@ -498,18 +471,12 @@ topology_template:
         - get_input: untrusted_vn_networks
         subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
         - get_input: vdbe_aap_untrusted_v6_ip_prefix
-        subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
-        - get_input: vdbe_aap_sec_untrusted_ip_prefix
         subinterface_vdbe_untr_2_subports_ip_v6_address:
         - get_input: vdbe_untrusted_v6_ip_1
         subinterface_vdbe_untr_2_subports_mac_address:
         - get_input: vdbe_hw_untr_mac_1
         subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
         - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
-        subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
-        - get_input: vdbe_aap_untrusted_ip_prefix_len
-        subinterface_vdbe_untr_2_subports_parent_interface:
-        - vdbe_1_untr_port_1
         compute_vdbe_name:
         - get_input: vdbe_name_1
         subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
@@ -524,6 +491,39 @@ topology_template:
             is_required: false
         subinterface_vdbe_untr_1_subports_vlan_tag_list:
         - get_input: untrusted_vlan_tags
+        subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
+        - get_input: vdbe_aap_untrusted_ip_prefix
+        subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
+        - get_input: vdbe_aap_untrusted_ip_prefix
+        subinterface_vdbe_untr_1_subports_ip_v6_address:
+        - get_input: vdbe_untrusted_v6_ip_1
+        port_vdbe_untr_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        subinterface_vdbe_untr_1_subports_parent_interface:
+        - vdbe_1_untr_port_1
+        subinterface_vdbe_untr_2_subports_service_template_filter_count:
+        - 5
+        subinterface_vdbe_untr_1_subports_service_template_filter_count:
+        - get_input: untrusted_num_vn
+        subinterface_vdbe_untr_2_subports_ip_address:
+        - get_input: vdbe_untrusted_ip_1
+        subinterface_vdbe_untr_1_subports_vmac_address:
+        - get_input: vdbe_untrusted_vmac_address
+        subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
+        - str_replace:
+            template: VM_NAMEDBE001p1n004
+            params:
+              DBE:
+                get_input: vdbe_device_name
+              VM_NAME:
+                get_input: vdbe_name_1
+        subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
+        - get_input: vdbe_aap_sec_untrusted_ip_prefix
+        subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
+        - get_input: vdbe_aap_untrusted_ip_prefix_len
+        subinterface_vdbe_untr_2_subports_parent_interface:
+        - vdbe_1_untr_port_1
         service_template_filter:
           substitute_service_template: Nested_vdbeServiceTemplate.yaml
           count: 1
@@ -552,4 +552,4 @@ topology_template:
           get_input: untr_vfc_instance_group_function
         subinterface_role: untr
       members:
-      - abstract_vdbe
+      - abstract_vdbe
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml
index 9886c59..dccbc26 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml
@@ -19,19 +19,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_vdbe_untr_port_subnetpoolid:
-      type: string
-      required: true
     subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix:
       type: list
       required: true
@@ -68,11 +55,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_1_subports_ip_v6_address:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix:
       type: list
       required: true
@@ -114,129 +96,152 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_vdbe_untr_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    subinterface_vdbe_untr_1_subports_parent_interface:
+    subinterface_vdbe_untr_1_subports_vn_network_list:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_service_template_filter_count:
+    port_vdbe_untr_port_name:
       type: list
       required: true
       entry_schema:
-        type: float
-    subinterface_vdbe_untr_1_subports_service_template_filter_count:
+        type: string
+    port_vdbe_untr_port_network_role:
+      type: string
+      required: true
+    subinterface_vdbe_untr_2_subports_vn_network_list:
       type: list
       required: true
       entry_schema:
-        type: float
-    subinterface_vdbe_untr_1_subports_vn_network_list:
+        type: string
+    subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_name:
+    subinterface_vdbe_untr_2_subports_ip_v6_address:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_vlan_requirements:
+    subinterface_vdbe_untr_2_subports_mac_address:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    subinterface_vdbe_untr_2_subports_ip_address:
+        type: string
+    subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_network_role:
-      type: string
-      required: true
-    subinterface_vdbe_untr_1_subports_vmac_address:
+    compute_vdbe_name:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
+    subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_vn_network_list:
+    port_vdbe_untr_port_related_networks:
       type: list
       required: true
       entry_schema:
-        type: string
-    subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
+    port_vdbe_untr_port_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    subinterface_vdbe_untr_2_subports_ip_v6_address:
+        type: org.openecomp.datatypes.network.IpRequirements
+    subinterface_vdbe_untr_1_subports_vlan_tag_list:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_mac_address:
+    subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len:
+    port_vdbe_untr_port_subnetpoolid:
+      type: string
+      required: true
+    subinterface_vdbe_untr_1_subports_ip_v6_address:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
+    port_vdbe_untr_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    subinterface_vdbe_untr_1_subports_parent_interface:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_parent_interface:
+    subinterface_vdbe_untr_2_subports_service_template_filter_count:
+      type: list
+      required: true
+      entry_schema:
+        type: float
+    subinterface_vdbe_untr_1_subports_service_template_filter_count:
+      type: list
+      required: true
+      entry_schema:
+        type: float
+    port_vdbe_untr_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    subinterface_vdbe_untr_2_subports_ip_address:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_vdbe_name:
+    subinterface_vdbe_untr_1_subports_vmac_address:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len:
+    subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len:
+    subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix:
       type: list
       required: true
       entry_schema:
         type: string
-    port_vdbe_untr_port_ip_requirements:
+    subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    subinterface_vdbe_untr_1_subports_vlan_tag_list:
+        type: string
+    subinterface_vdbe_untr_2_subports_parent_interface:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
   node_templates:
     vdbe_vdbe_untr_port_vdbe_untr_1_subports:
       type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
@@ -428,6 +433,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_port_ip_requirements
         network_role_tag:
@@ -653,4 +660,4 @@ topology_template:
       - subinterface_link_vdbe_0_subint_untr_vmi_0
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 96d91bc..ae99281 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -180,6 +180,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_port_ip_requirements:
         type: list
         required: true
@@ -669,4 +675,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
index 6494800..d962ae0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
@@ -152,6 +152,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_port_ip_requirements:
       type: list
       required: true
@@ -185,6 +190,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_port_ip_requirements
         network_role_tag:
@@ -476,4 +483,4 @@ topology_template:
       - dependency
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3a33693..e170d5a 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -13,6 +13,12 @@ node_types:
         description: Unique ID for this VF module inst
         required: true
         status: SUPPORTED
+      port_vdbe_0_untr_vmi_1_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_0_untr_vmi_1_network_role_tag:
         type: string
         required: true
@@ -690,4 +696,4 @@ node_types:
         type: tosca.capabilities.Node
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
index 668cdab..9ac9299 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml
@@ -16,6 +16,11 @@ topology_template:
       immutable: false
       type: string
       description: Unique ID for this VF module inst
+    port_vdbe_0_untr_vmi_1_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_0_untr_vmi_1_network_role_tag:
       type: string
       required: true
@@ -198,6 +203,8 @@ topology_template:
       properties:
         subnetpoolid:
           get_input: port_vdbe_0_untr_vmi_1_subnetpoolid
+        related_networks:
+          get_input: port_vdbe_0_untr_vmi_1_related_networks
         ip_requirements:
           get_input: port_vdbe_0_untr_vmi_1_ip_requirements
         network_role:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7bf576a..f514c61 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -280,6 +280,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_nested1_aap_sec_untrusted_ip_prefix:
         type: list
         required: true
@@ -951,6 +957,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_untr_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_port_ip_requirements:
         type: list
         required: true
@@ -1328,4 +1340,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
index 044f967..67fb906 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml
@@ -142,6 +142,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_nested1_aap_sec_untrusted_ip_prefix:
       type: list
       required: true
@@ -262,6 +267,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_port_ip_requirements
         network_role_tag:
@@ -472,4 +479,4 @@ topology_template:
       - dependency
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml
index 4ab26dd..f6128a3 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml
@@ -152,6 +152,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_untr_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_port_ip_requirements:
       type: list
       required: true
@@ -266,6 +271,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_port_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_port_related_networks
         ip_requirements:
           get_input: port_vdbe_untr_port_ip_requirements
         network_role_tag:
@@ -476,4 +483,4 @@ topology_template:
       - dependency
       dependency_vdbe:
       - vdbe
-      - dependency
+      - dependency
\ No newline at end of file

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e0caa6b..8e98129 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -126,6 +126,12 @@ node_types:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
         status: SUPPORTED
+      port_vdbe_untr_vmi_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vdbeav_subinterface_heat_template_aap_address_mode:
         type: list
         required: true
@@ -230,6 +236,12 @@ node_types:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_vdbe_ctrl_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_ctrl_0_port_network_role_tag:
         type: string
         required: true
@@ -320,6 +332,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_trst_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_fabr_0_port_virtual_network_refs:
         type: list
         required: true
@@ -354,10 +372,22 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_vdbe_oam_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_untr_vmi_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
+      port_vdbe_fabr_0_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vdbeav_subinterface_heat_template_mac_address:
         type: list
         required: true
@@ -1214,6 +1244,12 @@ node_types:
         type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
         required: true
         status: SUPPORTED
+      port_vdbe_untr_vmi_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vdbeav_subinterface_heat_template_aap_address_mode:
         type: list
         required: true
@@ -1230,6 +1266,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_vdbe_oam_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_ctrl_1_port_network_role:
         type: string
         required: true
@@ -1288,6 +1330,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_vdbe_ctrl_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_fabr_1_port_name:
         type: list
         required: true
@@ -1430,6 +1478,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_vdbe_trst_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       subinterface_vdbeav_subinterface_heat_template_ip_address:
         type: list
         required: true
@@ -1576,6 +1630,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_vdbe_fabr_1_port_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_vdbe_ctrl_1_port_ip_requirements:
         type: list
         required: true

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbeServiceTemplate.yaml
index 6d67aae..fb09f4f 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbeServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs:
       type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
       required: true
+    port_vdbe_untr_vmi_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_vdbeav_subinterface_heat_template_aap_address_mode:
       type: list
       required: true
@@ -98,6 +103,11 @@ topology_template:
     port_vdbe_ctrl_0_port_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_vdbe_ctrl_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_ctrl_0_port_network_role_tag:
       type: string
       required: true
@@ -170,6 +180,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_trst_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_fabr_0_port_virtual_network_refs:
       type: list
       required: true
@@ -197,9 +212,19 @@ topology_template:
     port_vdbe_trst_0_port_subnetpoolid:
       type: string
       required: true
+    port_vdbe_oam_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_untr_vmi_network_role_tag:
       type: string
       required: true
+    port_vdbe_fabr_0_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_vdbeav_subinterface_heat_template_mac_address:
       type: list
       required: true
@@ -339,23 +364,25 @@ topology_template:
     vdbe_vdbe_fabr_0_port:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
       properties:
+        mac_requirements:
+          get_input: port_vdbe_fabr_0_port_mac_requirements
+        order:
+          get_input: port_vdbe_fabr_0_port_order
         exCP_naming:
           get_input: port_vdbe_fabr_0_port_exCP_naming
         vlan_requirements:
           get_input: port_vdbe_fabr_0_port_vlan_requirements
         subinterface_indicator: false
-        ip_requirements:
-          get_input: port_vdbe_fabr_0_port_ip_requirements
         virtual_network_refs:
           get_input:
           - port_vdbe_fabr_0_port_virtual_network_refs
           - index_value
+        ip_requirements:
+          get_input: port_vdbe_fabr_0_port_ip_requirements
+        related_networks:
+          get_input: port_vdbe_fabr_0_port_related_networks
         network_role_tag:
           get_input: port_vdbe_fabr_0_port_network_role_tag
-        mac_requirements:
-          get_input: port_vdbe_fabr_0_port_mac_requirements
-        order:
-          get_input: port_vdbe_fabr_0_port_order
         network_role:
           get_input: port_vdbe_fabr_0_port_network_role
         subnetpoolid:
@@ -387,6 +414,8 @@ topology_template:
           - index_value
         ip_requirements:
           get_input: port_vdbe_oam_0_port_ip_requirements
+        related_networks:
+          get_input: port_vdbe_oam_0_port_related_networks
         network_role_tag:
           get_input: port_vdbe_oam_0_port_network_role_tag
         virtual_machine_interface_mac_addresses:
@@ -422,6 +451,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_trst_0_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_vdbe_trst_0_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_trst_0_port_virtual_network_refs
@@ -486,6 +517,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_vmi_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_vmi_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_vmi_virtual_network_refs
@@ -514,23 +547,25 @@ topology_template:
     vdbe_vdbe_ctrl_0_port:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
       properties:
+        mac_requirements:
+          get_input: port_vdbe_ctrl_0_port_mac_requirements
+        order:
+          get_input: port_vdbe_ctrl_0_port_order
         exCP_naming:
           get_input: port_vdbe_ctrl_0_port_exCP_naming
         vlan_requirements:
           get_input: port_vdbe_ctrl_0_port_vlan_requirements
         subinterface_indicator: false
-        ip_requirements:
-          get_input: port_vdbe_ctrl_0_port_ip_requirements
         virtual_network_refs:
           get_input:
           - port_vdbe_ctrl_0_port_virtual_network_refs
           - index_value
+        ip_requirements:
+          get_input: port_vdbe_ctrl_0_port_ip_requirements
+        related_networks:
+          get_input: port_vdbe_ctrl_0_port_related_networks
         network_role_tag:
           get_input: port_vdbe_ctrl_0_port_network_role_tag
-        mac_requirements:
-          get_input: port_vdbe_ctrl_0_port_mac_requirements
-        order:
-          get_input: port_vdbe_ctrl_0_port_order
         network_role:
           get_input: port_vdbe_ctrl_0_port_network_role
         subnetpoolid:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbe_1ServiceTemplate.yaml
index 5c3fb09..f95d633 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbe_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/out/Nested_vdbe_1ServiceTemplate.yaml
@@ -14,6 +14,11 @@ topology_template:
     port_vdbe_untr_vmi_virtual_machine_interface_allowed_address_pairs:
       type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
       required: true
+    port_vdbe_untr_vmi_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_vdbeav_subinterface_heat_template_aap_address_mode:
       type: list
       required: true
@@ -27,6 +32,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_vdbe_oam_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_ctrl_1_port_network_role:
       type: string
       required: true
@@ -73,6 +83,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_vdbe_ctrl_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_fabr_1_port_name:
       type: list
       required: true
@@ -187,6 +202,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_vdbe_trst_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     subinterface_vdbeav_subinterface_heat_template_ip_address:
       type: list
       required: true
@@ -305,6 +325,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
+    port_vdbe_fabr_1_port_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_vdbe_ctrl_1_port_ip_requirements:
       type: list
       required: true
@@ -375,6 +400,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_trst_1_port_vlan_requirements
         subinterface_indicator: false
+        related_networks:
+          get_input: port_vdbe_trst_1_port_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_trst_1_port_virtual_network_refs
@@ -418,6 +445,8 @@ topology_template:
           - index_value
         ip_requirements:
           get_input: port_vdbe_oam_1_port_ip_requirements
+        related_networks:
+          get_input: port_vdbe_oam_1_port_related_networks
         network_role_tag:
           get_input: port_vdbe_oam_1_port_network_role_tag
         virtual_machine_interface_mac_addresses:
@@ -453,6 +482,8 @@ topology_template:
         vlan_requirements:
           get_input: port_vdbe_untr_vmi_vlan_requirements
         subinterface_indicator: true
+        related_networks:
+          get_input: port_vdbe_untr_vmi_related_networks
         virtual_network_refs:
           get_input:
           - port_vdbe_untr_vmi_virtual_network_refs
@@ -481,23 +512,25 @@ topology_template:
     vdbe_vdbe_fabr_1_port:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
       properties:
+        mac_requirements:
+          get_input: port_vdbe_fabr_1_port_mac_requirements
+        order:
+          get_input: port_vdbe_fabr_1_port_order
         exCP_naming:
           get_input: port_vdbe_fabr_1_port_exCP_naming
         vlan_requirements:
           get_input: port_vdbe_fabr_1_port_vlan_requirements
         subinterface_indicator: false
-        ip_requirements:
-          get_input: port_vdbe_fabr_1_port_ip_requirements
         virtual_network_refs:
           get_input:
           - port_vdbe_fabr_1_port_virtual_network_refs
           - index_value
+        ip_requirements:
+          get_input: port_vdbe_fabr_1_port_ip_requirements
+        related_networks:
+          get_input: port_vdbe_fabr_1_port_related_networks
         network_role_tag:
           get_input: port_vdbe_fabr_1_port_network_role_tag
-        mac_requirements:
-          get_input: port_vdbe_fabr_1_port_mac_requirements
-        order:
-          get_input: port_vdbe_fabr_1_port_order
         network_role:
           get_input: port_vdbe_fabr_1_port_network_role
         subnetpoolid:
@@ -514,23 +547,25 @@ topology_template:
     vdbe_vdbe_ctrl_1_port:
       type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
       properties:
+        mac_requirements:
+          get_input: port_vdbe_ctrl_1_port_mac_requirements
+        order:
+          get_input: port_vdbe_ctrl_1_port_order
         exCP_naming:
           get_input: port_vdbe_ctrl_1_port_exCP_naming
         vlan_requirements:
           get_input: port_vdbe_ctrl_1_port_vlan_requirements
         subinterface_indicator: false
-        ip_requirements:
-          get_input: port_vdbe_ctrl_1_port_ip_requirements
         virtual_network_refs:
           get_input:
           - port_vdbe_ctrl_1_port_virtual_network_refs
           - index_value
+        ip_requirements:
+          get_input: port_vdbe_ctrl_1_port_ip_requirements
+        related_networks:
+          get_input: port_vdbe_ctrl_1_port_related_networks
         network_role_tag:
           get_input: port_vdbe_ctrl_1_port_network_role_tag
-        mac_requirements:
-          get_input: port_vdbe_ctrl_1_port_mac_requirements
-        order:
-          get_input: port_vdbe_ctrl_1_port_order
         network_role:
           get_input: port_vdbe_ctrl_1_port_network_role
         subnetpoolid:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 114521f..793c3bd 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,20 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.FSB1:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_FSB1_Internal_mac_address:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB1_Internal_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB2_Internal_2_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
       port_FSB1_Internal_subnetpoolid:
         type: string
         required: true
@@ -30,74 +22,142 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_subnetpoolid:
+      compute_FSB1_metadata:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_FSB2_Internal_2_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
-      compute_FSB1_metadata:
+      port_FSB1_Internal_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_FSB2_Internal_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_FSB1_OAM_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_FSB1_Internal_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_ip_requirements:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_FSB1_Internal_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB2_Internal_2_order:
+          type: string
+      port_FSB2_Internal_1_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_1_mac_address:
+      port_FSB2_Internal_2_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB1_OAM_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal_2_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_FSB2_Internal_1_network:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_FSB2_Internal_2_network_role:
         type: string
         required: true
         status: SUPPORTED
-      vm_flavor_name:
+      port_FSB1_OAM_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_2_mac_address:
+      port_FSB2_Internal_1_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_1_ip_requirements:
+      port_FSB2_Internal_2_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_1_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB1_Internal_mac_address:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_2_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_FSB1_OAM_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_FSB1_OAM_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_FSB1_OAM_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_FSB2_Internal_2_vlan_requirements:
-        type: list
+      port_FSB2_Internal_1_mac_address:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB1_Internal_network_role_tag:
+      port_FSB2_Internal_2_mac_address:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_vlan_requirements:
+      port_FSB2_Internal_1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB1_Internal_vlan_requirements:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB2_Internal_2_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
+      port_FSB1_Internal_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       port_FSB1_Internal_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -120,12 +180,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB1_Internal_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -134,16 +188,6 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      port_FSB2_Internal_1_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_2_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_OAM_order:
         type: integer
         required: true
@@ -154,28 +198,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB1_OAM_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      port_FSB2_Internal_1_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       port_FSB2_Internal_2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal_2_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB2_Internal_1_network_role_tag:
         type: string
         required: true
@@ -184,14 +212,18 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_network_role:
-        type: string
+      port_FSB2_Internal_1_related_networks:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_1_network_role:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_FSB1_OAM_related_networks:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
@@ -212,18 +244,10 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_FSB2_Internal_2_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB2_Internal_2_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_1_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
     requirements:
     - dependency_FSB1_FSB1_Internal:
         capability: tosca.capabilities.Node

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
index eb0ec30..20ecc57 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
@@ -11,31 +11,95 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_FSB1_Internal_mac_address:
-      type: string
-      required: true
     port_FSB1_Internal_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_FSB2_Internal_2_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_FSB1_Internal_subnetpoolid:
       type: string
       required: true
     port_FSB2_Internal_2_subnetpoolid:
       type: string
       required: true
-    port_FSB1_OAM_subnetpoolid:
-      type: string
-      required: true
     compute_FSB1_metadata:
       type: list
       required: true
       entry_schema:
         type: json
+    port_FSB2_Internal_2_order:
+      type: integer
+      required: true
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB1_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_FSB1_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_FSB1_Internal_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_1_order:
+      type: integer
+      required: true
+    port_FSB2_Internal_2_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_FSB1_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_2_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_FSB2_Internal_1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal_2_network_role:
+      type: string
+      required: true
+    port_FSB1_OAM_network_role:
+      type: string
+      required: true
+    port_FSB2_Internal_1_network_role:
+      type: string
+      required: true
+    port_FSB2_Internal_2_network_role_tag:
+      type: string
+      required: true
+    port_FSB2_Internal_1_subnetpoolid:
+      type: string
+      required: true
+    port_FSB1_Internal_mac_address:
+      type: string
+      required: true
+    port_FSB2_Internal_2_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_FSB1_OAM_subnetpoolid:
+      type: string
+      required: true
     port_FSB2_Internal_1_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -47,15 +111,9 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_FSB2_Internal_2_order:
-      type: integer
-      required: true
     port_FSB2_Internal_1_mac_address:
       type: string
       required: true
-    vm_flavor_name:
-      type: string
-      required: true
     port_FSB2_Internal_2_mac_address:
       type: string
       required: true
@@ -72,16 +130,6 @@ topology_template:
     port_FSB1_Internal_network_role_tag:
       type: string
       required: true
-    port_FSB1_OAM_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_FSB1_Internal_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB1_Internal_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -99,11 +147,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_FSB1_Internal_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -111,14 +154,6 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_FSB2_Internal_1_order:
-      type: integer
-      required: true
-    port_FSB2_Internal_2_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     port_FSB1_OAM_order:
       type: integer
       required: true
@@ -127,36 +162,27 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    port_FSB1_OAM_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_FSB2_Internal_1_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     port_FSB2_Internal_2_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal_2_network_role:
-      type: string
-      required: true
     port_FSB2_Internal_1_network_role_tag:
       type: string
       required: true
     port_FSB1_Internal_order:
       type: integer
       required: true
-    port_FSB1_OAM_network_role:
-      type: string
+    port_FSB2_Internal_1_related_networks:
+      type: list
       required: true
-    port_FSB2_Internal_1_network_role:
-      type: string
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_FSB1_OAM_related_networks:
+      type: list
       required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
@@ -173,19 +199,19 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_FSB2_Internal_2_network_role_tag:
-      type: string
-      required: true
     port_FSB2_Internal_2_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_FSB2_Internal_1_subnetpoolid:
-      type: string
-      required: true
   node_templates:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_Internal_mac_requirements
+        order:
+          get_input: port_FSB1_Internal_order
+        mac_address:
+          get_input: port_FSB1_Internal_mac_address
         exCP_naming:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
@@ -193,12 +219,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB1_Internal_related_networks
         network_role_tag:
           get_input: port_FSB1_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_Internal_mac_requirements
-        order:
-          get_input: port_FSB1_Internal_order
         network_role:
           get_input: port_FSB1_Internal_network_role
         subnetpoolid:
@@ -207,8 +231,6 @@ topology_template:
           get_input:
           - port_FSB1_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB1_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -217,6 +239,12 @@ topology_template:
     FSB1_FSB2_Internal_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB2_Internal_1_mac_requirements
+        order:
+          get_input: port_FSB2_Internal_1_order
+        mac_address:
+          get_input: port_FSB2_Internal_1_mac_address
         exCP_naming:
           get_input: port_FSB2_Internal_1_exCP_naming
         vlan_requirements:
@@ -224,12 +252,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_1_ip_requirements
+        related_networks:
+          get_input: port_FSB2_Internal_1_related_networks
         network_role_tag:
           get_input: port_FSB2_Internal_1_network_role_tag
-        mac_requirements:
-          get_input: port_FSB2_Internal_1_mac_requirements
-        order:
-          get_input: port_FSB2_Internal_1_order
         network_role:
           get_input: port_FSB2_Internal_1_network_role
         subnetpoolid:
@@ -238,8 +264,6 @@ topology_template:
           get_input:
           - port_FSB2_Internal_1_network
           - index_value
-        mac_address:
-          get_input: port_FSB2_Internal_1_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -248,6 +272,12 @@ topology_template:
     FSB1_FSB2_Internal_2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB2_Internal_2_mac_requirements
+        order:
+          get_input: port_FSB2_Internal_2_order
+        mac_address:
+          get_input: port_FSB2_Internal_2_mac_address
         exCP_naming:
           get_input: port_FSB2_Internal_2_exCP_naming
         vlan_requirements:
@@ -255,12 +285,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_2_ip_requirements
+        related_networks:
+          get_input: port_FSB2_Internal_2_related_networks
         network_role_tag:
           get_input: port_FSB2_Internal_2_network_role_tag
-        mac_requirements:
-          get_input: port_FSB2_Internal_2_mac_requirements
-        order:
-          get_input: port_FSB2_Internal_2_order
         network_role:
           get_input: port_FSB2_Internal_2_network_role
         subnetpoolid:
@@ -269,8 +297,6 @@ topology_template:
           get_input:
           - port_FSB2_Internal_2_network
           - index_value
-        mac_address:
-          get_input: port_FSB2_Internal_2_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -279,6 +305,10 @@ topology_template:
     FSB1_FSB1_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_OAM_mac_requirements
+        order:
+          get_input: port_FSB1_OAM_order
         exCP_naming:
           get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
@@ -286,20 +316,18 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_OAM_ip_requirements
+        related_networks:
+          get_input: port_FSB1_OAM_related_networks
         network_role_tag:
           get_input: port_FSB1_OAM_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_OAM_mac_requirements
-        order:
-          get_input: port_FSB1_OAM_order
         network_role:
           get_input: port_FSB1_OAM_network_role
-        subnetpoolid:
-          get_input: port_FSB1_OAM_subnetpoolid
         fixed_ips:
           get_input:
           - port_FSB1_OAM_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_FSB1_OAM_subnetpoolid
         network:
           get_input:
           - port_FSB1_OAM_network

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e22c860..42008cf 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,6 +18,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB2_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_subnetpoolid:
         type: string
         required: true
@@ -66,6 +72,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_FSB1_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_network_role_tag:
         type: string
         required: true
@@ -154,6 +166,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB1_OAM_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
index 82388da..99e7fd0 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
@@ -19,6 +19,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_FSB2_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_subnetpoolid:
       type: string
       required: true
@@ -57,6 +62,11 @@ topology_template:
     port_FSB2_Internal_network_role:
       type: string
       required: true
+    port_FSB1_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_network_role_tag:
       type: string
       required: true
@@ -127,6 +137,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB1_OAM_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
@@ -150,6 +165,12 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_Internal_mac_requirements
+        order:
+          get_input: port_FSB1_Internal_order
+        mac_address:
+          get_input: port_FSB1_Internal_mac_address
         exCP_naming:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
@@ -157,12 +178,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB1_Internal_related_networks
         network_role_tag:
           get_input: port_FSB1_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_Internal_mac_requirements
-        order:
-          get_input: port_FSB1_Internal_order
         network_role:
           get_input: port_FSB1_Internal_network_role
         subnetpoolid:
@@ -171,8 +190,6 @@ topology_template:
           get_input:
           - port_FSB1_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB1_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -181,6 +198,12 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB2_Internal_mac_requirements
+        order:
+          get_input: port_FSB2_Internal_order
+        mac_address:
+          get_input: port_FSB2_Internal_mac_address
         exCP_naming:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
@@ -188,12 +211,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB2_Internal_related_networks
         network_role_tag:
           get_input: port_FSB2_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB2_Internal_mac_requirements
-        order:
-          get_input: port_FSB2_Internal_order
         network_role:
           get_input: port_FSB2_Internal_network_role
         subnetpoolid:
@@ -202,8 +223,6 @@ topology_template:
           get_input:
           - port_FSB2_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB2_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -212,6 +231,10 @@ topology_template:
     FSB1_FSB1_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_OAM_mac_requirements
+        order:
+          get_input: port_FSB1_OAM_order
         exCP_naming:
           get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
@@ -219,20 +242,18 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_OAM_ip_requirements
+        related_networks:
+          get_input: port_FSB1_OAM_related_networks
         network_role_tag:
           get_input: port_FSB1_OAM_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_OAM_mac_requirements
-        order:
-          get_input: port_FSB1_OAM_order
         network_role:
           get_input: port_FSB1_OAM_network_role
-        subnetpoolid:
-          get_input: port_FSB1_OAM_subnetpoolid
         fixed_ips:
           get_input:
           - port_FSB1_OAM_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_FSB1_OAM_subnetpoolid
         network:
           get_input:
           - port_FSB1_OAM_network

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b0861ea..3167719 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,6 +18,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB2_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_subnetpoolid:
         type: string
         required: true
@@ -52,6 +58,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_FSB1_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_network_role_tag:
         type: string
         required: true

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
index 2978332..aa9a716 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -19,6 +19,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_FSB2_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_subnetpoolid:
       type: string
       required: true
@@ -46,6 +51,11 @@ topology_template:
     port_FSB2_Internal_network_role:
       type: string
       required: true
+    port_FSB1_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_network_role_tag:
       type: string
       required: true
@@ -112,6 +122,12 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_Internal_mac_requirements
+        order:
+          get_input: port_FSB1_Internal_order
+        mac_address:
+          get_input: port_FSB1_Internal_mac_address
         exCP_naming:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
@@ -119,12 +135,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB1_Internal_related_networks
         network_role_tag:
           get_input: port_FSB1_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_Internal_mac_requirements
-        order:
-          get_input: port_FSB1_Internal_order
         network_role:
           get_input: port_FSB1_Internal_network_role
         subnetpoolid:
@@ -133,8 +147,6 @@ topology_template:
           get_input:
           - port_FSB1_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB1_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -143,6 +155,12 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB2_Internal_mac_requirements
+        order:
+          get_input: port_FSB2_Internal_order
+        mac_address:
+          get_input: port_FSB2_Internal_mac_address
         exCP_naming:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
@@ -150,12 +168,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB2_Internal_related_networks
         network_role_tag:
           get_input: port_FSB2_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB2_Internal_mac_requirements
-        order:
-          get_input: port_FSB2_Internal_order
         network_role:
           get_input: port_FSB2_Internal_network_role
         subnetpoolid:
@@ -164,8 +180,6 @@ topology_template:
           get_input:
           - port_FSB2_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB2_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7aadbaf..a6fed8e 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,6 +18,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB2_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_subnetpoolid:
         type: string
         required: true
@@ -66,6 +72,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_FSB1_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_network_role_tag:
         type: string
         required: true
@@ -154,6 +166,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB1_OAM_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
index b3663c8..d8e84c2 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -19,6 +19,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_FSB2_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_subnetpoolid:
       type: string
       required: true
@@ -57,6 +62,11 @@ topology_template:
     port_FSB2_Internal_network_role:
       type: string
       required: true
+    port_FSB1_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_network_role_tag:
       type: string
       required: true
@@ -127,6 +137,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB1_OAM_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
@@ -150,6 +165,12 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_Internal_mac_requirements
+        order:
+          get_input: port_FSB1_Internal_order
+        mac_address:
+          get_input: port_FSB1_Internal_mac_address
         exCP_naming:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
@@ -157,12 +178,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB1_Internal_related_networks
         network_role_tag:
           get_input: port_FSB1_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_Internal_mac_requirements
-        order:
-          get_input: port_FSB1_Internal_order
         network_role:
           get_input: port_FSB1_Internal_network_role
         subnetpoolid:
@@ -171,8 +190,6 @@ topology_template:
           get_input:
           - port_FSB1_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB1_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -181,6 +198,12 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB2_Internal_mac_requirements
+        order:
+          get_input: port_FSB2_Internal_order
+        mac_address:
+          get_input: port_FSB2_Internal_mac_address
         exCP_naming:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
@@ -188,12 +211,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB2_Internal_related_networks
         network_role_tag:
           get_input: port_FSB2_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB2_Internal_mac_requirements
-        order:
-          get_input: port_FSB2_Internal_order
         network_role:
           get_input: port_FSB2_Internal_network_role
         subnetpoolid:
@@ -202,8 +223,6 @@ topology_template:
           get_input:
           - port_FSB2_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB2_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -212,6 +231,10 @@ topology_template:
     FSB1_FSB1_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_OAM_mac_requirements
+        order:
+          get_input: port_FSB1_OAM_order
         exCP_naming:
           get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
@@ -219,20 +242,18 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_OAM_ip_requirements
+        related_networks:
+          get_input: port_FSB1_OAM_related_networks
         network_role_tag:
           get_input: port_FSB1_OAM_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_OAM_mac_requirements
-        order:
-          get_input: port_FSB1_OAM_order
         network_role:
           get_input: port_FSB1_OAM_network_role
-        subnetpoolid:
-          get_input: port_FSB1_OAM_subnetpoolid
         fixed_ips:
           get_input:
           - port_FSB1_OAM_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_FSB1_OAM_subnetpoolid
         network:
           get_input:
           - port_FSB1_OAM_network

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3e8b719..f20b533 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,6 +18,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB2_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_subnetpoolid:
         type: string
         required: true
@@ -38,70 +44,84 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      compute_FSB1_availability_zone:
+      port_FSB2_Internal_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+          type: org.openecomp.datatypes.network.IpRequirements
+      vm_flavor_name:
+        type: string
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_FSB2_Internal_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_FSB2_Internal_network_role:
+        type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_ip_requirements:
+      port_FSB1_Internal_related_networks:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_flavor_name:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+      port_FSB1_Internal_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_mac_address:
-        type: string
+      port_FSB1_Internal_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_network_role:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_FSB2_Internal_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_exCP_naming:
+      port_FSB1_Internal_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      port_FSB1_Internal_network_role_tag:
+      port_FSB1_Internal_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_FSB1_Internal_order:
+      compute_FSB1_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      index_value:
         type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_FSB2_Internal_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_FSB1_Internal_vlan_requirements:
-        type: list
+      port_FSB2_Internal_mac_address:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_FSB2_Internal_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_FSB1_Internal_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB2_Internal_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB1_Internal_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -112,14 +132,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB1_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       port_FSB2_Internal_network_role_tag:
         type: string
         required: true

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
index 9e616c9..3e64830 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -19,6 +19,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_FSB2_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_subnetpoolid:
       type: string
       required: true
@@ -35,6 +40,39 @@ topology_template:
     port_FSB2_Internal_order:
       type: integer
       required: true
+    port_FSB2_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB2_Internal_network_role:
+      type: string
+      required: true
+    port_FSB1_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
+    port_FSB1_Internal_network_role_tag:
+      type: string
+      required: true
+    port_FSB1_Internal_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_FSB2_Internal_subnetpoolid:
+      type: string
+      required: true
+    port_FSB1_Internal_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_FSB1_Internal_network_role:
+      type: string
+      required: true
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -50,42 +88,20 @@ topology_template:
     port_FSB2_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_FSB2_Internal_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    vm_flavor_name:
-      type: string
-      required: true
     port_FSB2_Internal_mac_address:
       type: string
       required: true
-    port_FSB2_Internal_network_role:
-      type: string
-      required: true
     port_FSB2_Internal_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_FSB1_Internal_network_role_tag:
-      type: string
-      required: true
     port_FSB1_Internal_order:
       type: integer
       required: true
-    port_FSB1_Internal_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB2_Internal_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal_subnetpoolid:
-      type: string
-      required: true
     port_FSB1_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -94,12 +110,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_FSB1_Internal_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_FSB1_Internal_network_role:
-      type: string
-      required: true
     port_FSB2_Internal_network_role_tag:
       type: string
       required: true
@@ -107,6 +117,12 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_Internal_mac_requirements
+        order:
+          get_input: port_FSB1_Internal_order
+        mac_address:
+          get_input: port_FSB1_Internal_mac_address
         exCP_naming:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
@@ -114,12 +130,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB1_Internal_related_networks
         network_role_tag:
           get_input: port_FSB1_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_Internal_mac_requirements
-        order:
-          get_input: port_FSB1_Internal_order
         network_role:
           get_input: port_FSB1_Internal_network_role
         subnetpoolid:
@@ -128,8 +142,6 @@ topology_template:
           get_attribute:
           - FSB1_FSB2_Internal
           - att
-        mac_address:
-          get_input: port_FSB1_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -151,6 +163,8 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB2_Internal_related_networks
         network_role_tag:
           get_input: port_FSB2_Internal_network_role_tag
         network_role:

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 397a1a0..647db5b 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,6 +18,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_FSB2_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_subnetpoolid:
         type: string
         required: true
@@ -60,6 +66,12 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
+      port_FSB1_Internal_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_Internal_network_role_tag:
         type: string
         required: true
@@ -142,6 +154,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB1_OAM_related_networks:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
index bb7bb35..33e1cb9 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -19,6 +19,11 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_FSB2_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_subnetpoolid:
       type: string
       required: true
@@ -52,6 +57,11 @@ topology_template:
     port_FSB2_Internal_network_role:
       type: string
       required: true
+    port_FSB1_Internal_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_Internal_network_role_tag:
       type: string
       required: true
@@ -117,6 +127,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB1_OAM_related_networks:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
@@ -135,6 +150,12 @@ topology_template:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_Internal_mac_requirements
+        order:
+          get_input: port_FSB1_Internal_order
+        mac_address:
+          get_input: port_FSB1_Internal_mac_address
         exCP_naming:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
@@ -142,12 +163,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB1_Internal_related_networks
         network_role_tag:
           get_input: port_FSB1_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_Internal_mac_requirements
-        order:
-          get_input: port_FSB1_Internal_order
         network_role:
           get_input: port_FSB1_Internal_network_role
         subnetpoolid:
@@ -156,8 +175,6 @@ topology_template:
           get_input:
           - port_FSB1_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB1_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -166,6 +183,12 @@ topology_template:
     FSB1_FSB2_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB2_Internal_mac_requirements
+        order:
+          get_input: port_FSB2_Internal_order
+        mac_address:
+          get_input: port_FSB2_Internal_mac_address
         exCP_naming:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
@@ -173,12 +196,10 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
+        related_networks:
+          get_input: port_FSB2_Internal_related_networks
         network_role_tag:
           get_input: port_FSB2_Internal_network_role_tag
-        mac_requirements:
-          get_input: port_FSB2_Internal_mac_requirements
-        order:
-          get_input: port_FSB2_Internal_order
         network_role:
           get_input: port_FSB2_Internal_network_role
         subnetpoolid:
@@ -187,8 +208,6 @@ topology_template:
           get_input:
           - port_FSB2_Internal_network
           - index_value
-        mac_address:
-          get_input: port_FSB2_Internal_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -197,6 +216,10 @@ topology_template:
     FSB1_FSB1_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        mac_requirements:
+          get_input: port_FSB1_OAM_mac_requirements
+        order:
+          get_input: port_FSB1_OAM_order
         exCP_naming:
           get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
@@ -204,20 +227,18 @@ topology_template:
         subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_OAM_ip_requirements
+        related_networks:
+          get_input: port_FSB1_OAM_related_networks
         network_role_tag:
           get_input: port_FSB1_OAM_network_role_tag
-        mac_requirements:
-          get_input: port_FSB1_OAM_mac_requirements
-        order:
-          get_input: port_FSB1_OAM_order
         network_role:
           get_input: port_FSB1_OAM_network_role
-        subnetpoolid:
-          get_input: port_FSB1_OAM_subnetpoolid
         fixed_ips:
           get_input:
           - port_FSB1_OAM_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_FSB1_OAM_subnetpoolid
         network:
           get_input:
           - port_FSB1_OAM_network

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml
index e4ee3cc..54db7a4 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/noConsolidation/out/MainServiceTemplate.yaml
@@ -97,16 +97,16 @@ topology_template:
       directives:
       - substitutable
       properties:
+        vm_flavor_name: FLAVOR-test
+        vm_image_name: Image-test
         compute_QRouter_availability_zone:
         - Availability-test
         compute_QRouter_config_drive:
         - true
         port_cdr_network_port_network:
         - get_input: cdr_network
-        vm_flavor_name: FLAVOR-test
         port_oam_private_net_network_port_network:
         - get_input: oam_private_net_name
-        vm_image_name: Image-test
         compute_QRouter_name:
         - QRouter-name
         service_template_filter: