Fix openecomp references in vnfapi

Fixed incorrect references to openecomp in vnfapi directed graphs

Change-Id: Ic58fddba75eb4e01ce2e13914f9e30dae08ae8ef
Issue-ID: SDNC-148
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: c0cdcf754db3983f8cbf2ab62ddee9f2663ab0f0

6 files changed, 14 insertions, 14 deletions

diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
index 29b93a7a..70fbf6a0 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
@@ -87,7 +87,7 @@
 <parameter name="tmp.dhcpEnabled.boolean" value="false" />
 </set></outcome></switch><set>
 <parameter name="tmp.gateway-address" value="`$preload-data.network-topology-information.subnets[$i].gateway-address`" />
-</set><switch test="`$preload-data.network-topology-information.subnets[$i].gateway-address`"><outcome value=''><block atomic='true'><execute plugin="org.openecomp.sdnc.sli.plugin.ipAddressTools.IpAddressTool" method="getGatewayAddress">
+</set><switch test="`$preload-data.network-topology-information.subnets[$i].gateway-address`"><outcome value=''><block atomic='true'><execute plugin="org.onap.ccsdk.sli.plugins.ipaddresstools.IpAddressTool" method="getGatewayAddress">
     <parameter name="ipAddress" value="`$preload-data.network-topology-information.subnets[$i].start-address`" />
     <parameter name="ipVersion" value="`$preload-data.network-topology-information.subnets[$i].ip-version`" />
     <parameter name="subnet" value="`$preload-data.network-topology-information.subnets[$i].cidr-mask`" />
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml
index 4525ffa8..7f35d4e7 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml
@@ -61,7 +61,7 @@
 <set>
 <parameter name="tmp.subnetUpdate" value="1" />
 </set></outcome></switch><switch test="`$preload-data.network-topology-information.subnets[$n].gateway-address`"><outcome value=''><block>
-<execute plugin="org.openecomp.sdnc.sli.plugin.ipAddressTools.IpAddressTool" method="getGatewayAddress">
+<execute plugin="org.onap.ccsdk.sli.plugins.ipaddresstools.IpAddressTool" method="getGatewayAddress">
     <parameter name="ipAddress" value="`$preload-data.network-topology-information.subnets[$n].start-address`" />
     <parameter name="ipVersion" value="`$preload-data.network-topology-information.subnets[$n].ip-version`" />
     <parameter name="subnet" value="`$preload-data.network-topology-information.subnets[$n].cidr-mask`" />
@@ -196,7 +196,7 @@
 </set></outcome></switch><set>
 <parameter name='tmp.gateway-address' value='`$preload-data.network-topology-information.subnets[$i].gateway-address`' />
 </set><switch test="`$preload-data.network-topology-information.subnets[$i].gateway-address`"><outcome value=''><block>
-<execute plugin="org.openecomp.sdnc.sli.plugin.ipAddressTools.IpAddressTool" method="getGatewayAddress">
+<execute plugin="org.onap.ccsdk.sli.plugins.ipaddresstools.IpAddressTool" method="getGatewayAddress">
     <parameter name="ipAddress" value="`$preload-data.network-topology-information.subnets[$i].start-address`" />
     <parameter name="ipVersion" value="`$preload-data.network-topology-information.subnets[$i].ip-version`" />
     <parameter name="subnet" value="`$preload-data.network-topology-information.subnets[$i].cidr-mask`" />
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
index 966f66b9..f5efcc61 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
@@ -1,6 +1,6 @@
 <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="preload-vf-module-topology-operation" mode="sync"><block atomic="true"><switch test="`$preload-vf-module-topology-operation-input.request-information.request-action`">

 

-<outcome value='PreloadVfModuleRequest'><block atomic="true"><get-resource plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource" 

+<outcome value='PreloadVfModuleRequest'><block atomic="true"><get-resource plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" 

 	resource="vnf-profile" key="SELECT * from VNF_PROFILE where vnf_type = $preload-vf-module-topology-operation-input.vf-module-topology-information.vf-module-identifiers.vf-module-model-id">

 <outcome value='not-found'>

 <return status='failure'>

diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
index 97e4a18e..a8929f27 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
@@ -1,6 +1,6 @@
 <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="preload-vnf-instance-topology-operation" mode="sync"><block atomic="true"><switch test="`$preload-vnf-instance-topology-operation-input.request-information.request-action`">

 

-<outcome value='PreloadVnfInstanceRequest'><block atomic="true"><get-resource plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource" 

+<outcome value='PreloadVnfInstanceRequest'><block atomic="true"><get-resource plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" 

 	resource="vnf-profile" key="SELECT * from VNF_PROFILE where vnf_type = $preload-vnf-instance-topology-operation-input.vnf-instance-topology-information.vnf-instance-identifiers.vnf-model-id">

 <outcome value='not-found'>

 <return status='failure'>

diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml
index 043dbe31..f2059764 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml
@@ -5,7 +5,7 @@
 <parameter name='service-data.service-information.service-type' 

 	value='NOT_APPLICABLE' />

 	

-</set><update plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource" resource="SQL"

+</set><update plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" resource="SQL"

 	key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status 

 		WHERE info = $vnf-topology-operation-input.vnf-request-information.vnf-id" ><outcome value='failure'>

 <return status='failure'>

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 dafaa16b..28a77e88 100644
--- 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
@@ -7,7 +7,7 @@
 	<parameter name='ack-final' value='Y'/>

 	<parameter name="error-code" value="500" />

     <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'VNFActivateRequest'" />

-</return></outcome></switch><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'

+</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

   key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'

   pfx='db.vf-module-model'>

 

@@ -59,7 +59,7 @@
 <block atomic="true"><set>

 <parameter name='tmp.vnf-topology.vnf-assignments.availability-zones[$az-index].availability-zone'

   value='`$aai.cloud-region.availability-zones.availability-zone[$az-index].availability-zone-name`' />

-</set></block></for></block><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'

+</set></block></for></block><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

   key='SELECT * from VF_MODULE_TO_VFC_MAPPING WHERE vf_module_customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'

   pfx='db.vf-module-to-vfc-mapping[]'>

 

@@ -75,7 +75,7 @@
 <parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms_length'

   value='`$db.vf-module-to-vfc-mapping_length`' />

 </set><for index='vm-type-index' start='0' end='`$db.vf-module-to-vfc-mapping_length`' >

-<block atomic="true"><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'

+<block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

   key='SELECT * from VFC_MODEL WHERE customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'

   pfx='db.vfc-model'>

 

@@ -122,7 +122,7 @@
 </set></outcome></call></block></for><set>

 <parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names_length'

   value='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-count`' />

-</set><get-resource plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'

+</set><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

   key='SELECT * from VFC_TO_NETWORK_ROLE_MAPPING WHERE vfc_customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'

   pfx='db.vfc-to-network-role-mapping[]'>

 

@@ -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'

    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`' >

 <for index='vm-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-count`' >

-<block atomic="true"><delete plugin='org.openecomp.sdnc.sli.resource.sql.SqlResource' resource='SQL'

+<block atomic="true"><delete plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'

   key='DELETE from VIPR_CONFIGURATION WHERE vnf_id = $service-data.vnf-id

      AND ecomp_service_instance_id = $vnf-topology-operation-input.service-information.service-instance-id

      AND vm_name = $tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index].vm-name' ><outcome value='failure'>

-<record plugin="org.openecomp.sdnc.sli.recording.Slf4jRecorder">

+<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

 <parameter name="logger" value="message-log"/>

 <parameter name="field1" value="__TIMESTAMP__"/>

 <parameter name="field2" value="VNF-API.vnf-topology-automated-assign-vfmodule:REQID"/>

 <parameter name="field3" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`"/>

 <parameter name="field4" value="Failed to insert VIPR_CONFIGURATION record"/>

-</record></outcome></delete><save plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource" resource="SQL"

+</record></outcome></delete><save plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" resource="SQL"

 	key="INSERT INTO VIPR_CONFIGURATION (vnf_id, 

 		vnf_name, 

 		ecomp_service_instance_id, 

@@ -331,7 +331,7 @@
 		$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index]-vm-name , 

 		$vnf-topology-operation.vnf-request-information.aic-cloud-region , 

 		'Rackspace')" ><outcome value='failure'>

-<record plugin="org.openecomp.sdnc.sli.recording.Slf4jRecorder">

+<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

 <parameter name="logger" value="message-log"/>

 <parameter name="field1" value="__TIMESTAMP__"/>

 <parameter name="field2" value="VNF-API.vnf-topology-automated-assign-vfmodule:REQID"/>