X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml;fp=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml;h=acae25e5c8b77518700cf8c18e7502ac14df51d1;hb=a6c6776d93ee0ec6bd8aefa23ac107262cf93154;hp=7c1d8733800182171bb98eb4f52c3fe7b086fb83;hpb=b0ec399c096b8d4ccdd5adff17fd4fd59d0f72d1;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
index 7c1d8733..acae25e5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
@@ -978,9 +978,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1044,9 +1044,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1137,9 +1137,9 @@
                                                                                                                                             <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                             <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                             <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                            <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                            <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                            <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                                                                                                             <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                         </save>
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1200,9 +1200,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1819,9 +1819,9 @@
                                                                                                                                                         <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                                         <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                                         <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                                        <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                                        <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                                        <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
                                                                                                                                                         <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                                     </save>
                                                                                                                                                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'