Merge "Remove test for Active on Delete"

[sdnc/oam.git] / platform-logic / vnfapi / src / main / xml / VNF-API_vnf-topology-automated-assign-vfmodule.xml

diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
index ddbd377..7ce6b2d 100644 (file)
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
@@ -1,4 +1,4 @@
-<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-automated-assign-vfmodule' mode='sync'>\r
+<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-automated-assign-vfmodule' mode='sync'>\r
 <block atomic="true"><switch test='`$vnf-topology-operation-input.request-information.request-action`'>\r
 <outcome value='VNFActivateRequest'>\r
 <block>\r
@@ -7,7 +7,7 @@
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'VNFActivateRequest'" />\r
-</return></outcome></switch><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'\r
+</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
   key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'\r
   pfx='db.vf-module-model'>\r
 \r
@@ -21,9 +21,9 @@
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="404" />\r
     <parameter name="error-message" value="`'No model found for VF module customization UUID ' + $vnf-topology-operation-input.vnf-request-information.model-customization-uuid`" />\r
-</return></outcome></get-resource><get-resource plugin="org.openecomp.sdnc.sli.aai.AAIService" \r
+</return></outcome></get-resource><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="cloud-region" \r
-               key="cloud-region.cloud-owner = 'att-aic' AND \r
+               key="cloud-region.cloud-owner = 'CloudOwner' AND \r
                     cloud-region.cloud-region-id = $vnf-topology-operation-input.vnf-request-information.aic-cloud-region"\r
         pfx='aai.cloud-region' local-only='false' >\r
 \r
@@ -45,7 +45,7 @@
        <parameter name="service-data." value="vnf-topology-operation-input." /></set><for index='idx' start='0' end='`$aai.cloud-region.relationship-list.relationship_length`' >\r
 <switch test='`$aai.cloud-region.relationship-list.relationship[$idx].related-to`'>\r
 <outcome value='complex'>\r
-<block atomic="true"><execute plugin='org.openecomp.sdnc.sli.SliPluginUtils.SliStringUtils' method='split'>\r
+<block atomic="true"><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>\r
    <parameter name='ctx_memory_result_key' value='aai-uid-split' />\r
    <parameter name='original_string' value='`$aai.cloud-region.relationship-list.relationship[$idx].related-link`' />\r
    <parameter name='regex' value='/' />\r
@@ -59,7 +59,7 @@
 <block atomic="true"><set>\r
 <parameter name='tmp.vnf-topology.vnf-assignments.availability-zones[$az-index].availability-zone'\r
   value='`$aai.cloud-region.availability-zones.availability-zone[$az-index].availability-zone-name`' />\r
-</set></block></for></block><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'\r
+</set></block></for></block><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
   key='SELECT * from VF_MODULE_TO_VFC_MAPPING WHERE vf_module_customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'\r
   pfx='db.vf-module-to-vfc-mapping[]'>\r
 \r
@@ -75,7 +75,7 @@
 <parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms_length'\r
   value='`$db.vf-module-to-vfc-mapping_length`' />\r
 </set><for index='vm-type-index' start='0' end='`$db.vf-module-to-vfc-mapping_length`' >\r
-<block atomic="true"><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'\r
+<block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
   key='SELECT * from VFC_MODEL WHERE customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'\r
   pfx='db.vfc-model'>\r
 \r
@@ -122,7 +122,7 @@
 </set></outcome></call></block></for><set>\r
 <parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names_length'\r
   value='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-count`' />\r
-</set><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'\r
+</set><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
   key='SELECT * from VFC_TO_NETWORK_ROLE_MAPPING WHERE vfc_customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'\r
   pfx='db.vfc-to-network-role-mapping[]'>\r
 \r
@@ -140,7 +140,7 @@
 </set><set>\r
 <parameter name='network-index' value='0' />\r
 </set><for index='network-role-index' start='0' end='`$db.vfc-to-network-role-mapping_length`' >\r
-<block atomic="true"><get-resource plugin="org.openecomp.sdnc.sli.aai.AAIService" \r
+<block atomic="true"><get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="l3-networks" \r
                key="l3-network.network-role = $db.vfc-to-network-role-mapping[$network-role-index].network-role"\r
         pfx='aai.l3-network' local-only='false'\r
@@ -308,17 +308,17 @@
 <parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-ips-v6[$ip-count-index].ip-address-ipv6'\r
    value='`$eipam-ip-block.plans[$plans-index].requests[$rqst-index].ip-prefix`' /></set></outcome></switch></for></block></for></block></for></outcome></switch></for></for><for index='vm-type-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms_length`' >\r
 <for index='vm-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-count`' >\r
-<block atomic="true"><delete plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'\r
+<block atomic="true"><delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
   key='DELETE from VIPR_CONFIGURATION WHERE vnf_id = $service-data.vnf-id\r
      AND ecomp_service_instance_id = $vnf-topology-operation-input.service-information.service-instance-id\r
      AND vm_name = $tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index].vm-name' ><outcome value='failure'>\r
-<record plugin="org.openecomp.sdnc.sli.recording.Slf4jRecorder">\r
+<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
 <parameter name="logger" value="message-log"/>\r
 <parameter name="field1" value="__TIMESTAMP__"/>\r
 <parameter name="field2" value="VNF-API.vnf-topology-automated-assign-vfmodule:REQID"/>\r
 <parameter name="field3" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`"/>\r
 <parameter name="field4" value="Failed to insert VIPR_CONFIGURATION record"/>\r
-</record></outcome></delete><save plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource" resource="SQL"\r
+</record></outcome></delete><save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"\r
        key="INSERT INTO VIPR_CONFIGURATION (vnf_id, \r
                vnf_name, \r
                ecomp_service_instance_id, \r
@@ -330,8 +330,8 @@
                $vnf-topology-operation-input.service-information.service-instance-id , \r
                $tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index]-vm-name , \r
                $vnf-topology-operation.vnf-request-information.aic-cloud-region , \r
-               'att-aic')" ><outcome value='failure'>\r
-<record plugin="org.openecomp.sdnc.sli.recording.Slf4jRecorder">\r
+               'CloudOwner')" ><outcome value='failure'>\r
+<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
 <parameter name="logger" value="message-log"/>\r
 <parameter name="field1" value="__TIMESTAMP__"/>\r
 <parameter name="field2" value="VNF-API.vnf-topology-automated-assign-vfmodule:REQID"/>\r
@@ -339,6 +339,6 @@
 <parameter name="field4" value="Failed to insert VIPR_CONFIGURATION record"/>\r
 </record></outcome></save></block></for></for><set>\r
 <parameter name='service-data.vnf-topology-information.' value='tmp.vnf-topology.' />\r
-</set><execute plugin='org.openecomp.sdnc.sli.SliPluginUtils.SliPluginUtils' method='printContext' >\r
+</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
 <parameter name='filename' value='/var/tmp/bgb-vnfapi-vfmodule.log' />\r
-</execute></block></method></service-logic>
\ No newline at end of file
+</execute></block></method></service-logic>