1 files changed, 210 insertions, 106 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
index ec375552..dda220aa 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
@@ -1,123 +1,227 @@
-<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='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='service-topology-operation-assign' mode='sync'>
-<block atomic="true"><switch test='`$service-topology-operation-input.request-information.request-action`'>
-<outcome value='CreateServiceInstance'>
-<block>
-</block></outcome><outcome value='Other'>
-<return status='failure'>
-	<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 'CreateServiceInstance'" />
-</return></outcome></switch><switch test='`$service-data.service-level-oper-status.order-status`'>
-<outcome value=''><block>
-</block></outcome><outcome value='Created'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="The requested service already exists" />
-</return></outcome><outcome value='PendingDelete'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="The requested service is pending deletion" />
-</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+<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='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='service-topology-operation-assign' mode='sync'>
+        <block atomic="true">
+            <switch test='`$service-topology-operation-input.request-information.request-action`'>
+                <outcome value='CreateServiceInstance'>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <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 'CreateServiceInstance'" />
+                    </return>
+                </outcome>
+            </switch>
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-topology-operation-input.service-information.onap-model-information.model-uuid'
   pfx='db.service-model'>
-
-<outcome value='failure'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="Error reading SERVICE_MODEL table" />
-</return></outcome><outcome value='not-found'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No model found for service UUID ' + $service-topology-operation-input.service-information.onap-model-information.model-uuid`" />
-</return></outcome></get-resource><switch test='`$service-topology-operation-input.service-request-input.service-instance-name`'>
-<outcome value=''><block atomic="true"><switch test='`$db.service-model.ecomp-naming`'>
-<outcome value='Y'><block>
-</block></outcome><outcome value='N'><return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="No service-instance-name was received but ecomp-naming is not Y" />
-</return></outcome><outcome value='Other'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="No service-instance-name was received but ecomp-naming is not Y" />
-</return></outcome></switch><set>
-<parameter name='generate-unique-name-input.index-table-name' value='SERVICE_INSTANCE_NAME_INDEX' />
-<parameter name='generate-unique-name-input.index-table-prefix-column' value='service_instance_name_prefix' />
-<parameter name='generate-unique-name-input.name-table-type' value='SERVICE_INSTANCE' />
-<parameter name='generate-unique-name-input.prefix' value="`$db.service-model.service-instance-name-prefix + '_'`" />
-</set><call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >
-<outcome value='failure'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`$generate-unique-name-output.error-message`" />
-</return></outcome><outcome value='success'>
-<set>
-<parameter name='tmp.service-instance-name' value='`$generate-unique-name-output.generated-name`' />
-</set></outcome></call></block></outcome><outcome value='Other'>
-<block atomic="true"><set>
-<parameter name='generate-unique-name-input.name-table-type' value='SERVICE_INSTANCE' />
-<parameter name='generate-unique-name-input.supplied-name' value='`$service-topology-operation-input.service-request-input.service-instance-name`' />
-</set><call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >
-<outcome value='failure'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`$generate-unique-name-output.error-message`" />
-</return></outcome><outcome value='success'>
-<set>
-<parameter name='tmp.service-instance-name' value="`$service-topology-operation-input.service-request-input.service-instance-name`" />
-</set></outcome></call></block></outcome></switch><set>
-<parameter name='service-object-path'
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error reading SERVICE_MODEL table" />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'No model found for service UUID ' + $service-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+                    </return>
+                </outcome>
+            </get-resource>
+            <set>
+                <parameter name='tmp.service-instance-name' value='' />
+            </set>
+            <switch test='`$service-topology-operation-input.service-request-input.service-instance-name`'>
+                <outcome value=''>
+                    <block atomic="true">
+                        <switch test='`$db.service-model.ecomp-naming`'>
+                            <outcome value='Y'>
+                                <block></block>
+                            </outcome>
+                            <outcome value='N'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="No service-instance-name was received but ecomp-naming is not Y" />
+                                </return>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="No service-instance-name was received but ecomp-naming is not Y" />
+                                </return>
+                            </outcome>
+                        </switch>
+                        <switch test='`$db.service-model.naming-policy`'>
+                            <outcome value=''>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='generate-unique-name-input.action' value='ASSIGN' />
+                                        <parameter name='generate-unique-name-input.context-id' value='`$service-topology-operation-input.service-information.service-instance-id`' />
+                                        <parameter name='generate-unique-name-input.index-table-name' value='SERVICE_INSTANCE_NAME_INDEX' />
+                                        <parameter name='generate-unique-name-input.index-table-prefix-column' value='service_instance_name_prefix' />
+                                        <parameter name='generate-unique-name-input.name-table-type' value='SERVICE_INSTANCE' />
+                                        <parameter name='generate-unique-name-input.prefix' value="`$db.service-model.service-instance-name-prefix + '_'`" />
+                                    </set>
+                                    <call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`$generate-unique-name-output.error-message`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='tmp.service-instance-name' value='`$generate-unique-name-output.generated-name`' />
+                                            </set>
+                                        </outcome>
+                                    </call>
+                                </block>
+                            </outcome>
+                            <outcome value='Other'>
+                                <block atomic="true">
+                                    <set>
+                                        <parameter name='generated-via-policy' value='true' />
+                                    </set>
+                                    <set>
+                                        <parameter name='naming-policy-generate-name-input.policy-instance-name' value='`$db.service-model.naming-policy`' />
+                                        <parameter name='naming-policy-generate-name-input.naming-type' value='SERVICE' />
+                                        <parameter name='naming-policy-generate-name-input.context-id' value='`$service-topology-operation-input.service-information.service-instance-id`' />
+                                        <parameter name='naming-policy-generate-name-input.query-parameter' value='`$db.service-model.service-uuid`' />
+                                        <parameter name='naming-policy-generate-name-input.action' value='ASSIGN' />
+                                    </set>
+                                    <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' >
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Unable to generate service name" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <set>
+                                                <parameter name='tmp.service-instance-name' value='`$naming-policy-generate-name-output.service-name`' />
+                                            </set>
+                                        </outcome>
+                                    </call>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <set>
+                            <parameter name='generate-unique-name-input.name-table-type' value='SERVICE_INSTANCE' />
+                            <parameter name='generate-unique-name-input.supplied-name' value='`$service-topology-operation-input.service-request-input.service-instance-name`' />
+                        </set>
+                        <call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >
+                            <outcome value='failure'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`$generate-unique-name-output.error-message`" />
+                                </return>
+                            </outcome>
+                            <outcome value='success'>
+                                <set>
+                                    <parameter name='tmp.service-instance-name' value="`$service-topology-operation-input.service-request-input.service-instance-name`" />
+                                </set>
+                            </outcome>
+                        </call>
+                    </block>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='service-object-path'
  value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
  + $service-topology-operation-input.service-information.service-instance-id
  + '/service-data/service-topology/'`"/>
-</set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+            </set>
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="service-instance" 
 		key="customer.global-customer-id = $service-topology-operation-input.service-information.global-customer-id AND
 			service-subscription.service-type = $service-topology-operation-input.service-information.subscription-service-type AND
 			service-instance.service-instance-id = $service-topology-operation-input.service-information.service-instance-id"
         pfx='pfx' local-only='false' force='false'>
-	<parameter name="service-instance-name" value="`$tmp.service-instance-name`" />
-	<parameter name="selflink" value="`$service-object-path`" />
-<outcome value='failure'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="AAI failed" />
-</return></outcome><outcome value='not-found'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="The service instance does not exist in AAI" />
-</return></outcome></update><set>
-<parameter name='service-data.service-topology.service-topology-identifier.service-instance-id'
+                <parameter name="service-instance-name" value="`$tmp.service-instance-name`" />
+                <parameter name="selflink" value="`$service-object-path`" />
+                <outcome value='failure'>
+                    <block>
+                        <block atomic="true">
+                            <set>
+                                <parameter name='naming-policy-generate-name-input.naming-type' value='SERVICE' />
+                                <parameter name='naming-policy-generate-name-input.context-id' value='`$service-topology-operation-input.service-information.service-instance-id`' />
+                                <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
+                            </set>
+                            <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                        </block>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="Failure calling AAI to update the service instance" />
+                        </return>
+                    </block>
+                </outcome>
+                <outcome value='not-found'>
+                    <block>
+                        <block atomic="true">
+                            <set>
+                                <parameter name='naming-policy-generate-name-input.naming-type' value='SERVICE' />
+                                <parameter name='naming-policy-generate-name-input.context-id' value='`$service-topology-operation-input.service-information.service-instance-id`' />
+                                <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
+                            </set>
+                            <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                        </block>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="The service instance does not exist in AAI" />
+                        </return>
+                    </block>
+                </outcome>
+            </update>
+            <set>
+                <parameter name='service-data.service-topology.service-topology-identifier.service-instance-id'
   value='`$service-topology-operation-input.service-information.service-instance-id`' />
-<parameter name='service-data.service-topology.service-topology-identifier.service-type'
+                <parameter name='service-data.service-topology.service-topology-identifier.service-type'
   value='`$service-topology-operation-input.service-information.subscription-service-type`' />
-<parameter name='service-data.service-topology.service-topology-identifier.service-instance-name'
+                <parameter name='service-data.service-topology.service-topology-identifier.service-instance-name'
   value='`$tmp.service-instance-name`' />
-<parameter name='service-data.service-topology.service-topology-identifier.global-customer-id'
+                <parameter name='service-data.service-topology.service-topology-identifier.global-customer-id'
   value='`$service-topology-operation-input.service-information.global-customer-id`' />
-</set><set>
-<parameter name='service-data.service-topology.onap-model-information.'
+            </set>
+            <set>
+                <parameter name='service-data.service-topology.onap-model-information.'
   value='`$service-topology-operation-input.service-information.onap-model-information.`' />
-</set><switch test='`$service-topology-operation-input.service-request-input.service-input-parameters.param_length`'>
-<outcome value=''><block>
-</block></outcome><outcome value='Other'>
-<for index='idx' start='0' end='`$service-topology-operation-input.service-request-input.service-input-parameters.param_length`' >
-<set>
-<parameter name='service-data.service-topology.service-parameters[$idx].service-parameter-name'
+            </set>
+            <switch test='`$service-topology-operation-input.service-request-input.service-input-parameters.param_length`'>
+                <outcome value=''>
+                    <block></block>
+                </outcome>
+                <outcome value='Other'>
+                    <for index='idx' start='0' end='`$service-topology-operation-input.service-request-input.service-input-parameters.param_length`' >
+                        <set>
+                            <parameter name='service-data.service-topology.service-parameters[$idx].service-parameter-name'
   value='`$service-topology-operation-input.service-request-input.service-input-parameters.param[$idx].name`' />
-<parameter name='service-data.service-topology.service-parameters[$idx].service-parameter-value'
+                            <parameter name='service-data.service-topology.service-parameters[$idx].service-parameter-value'
   value='`$service-topology-operation-input.service-request-input.service-input-parameters.param[$idx].value`' />
-</set></for></outcome></switch><set>
-<parameter name='service-data.service-level-oper-status.order-status' value='Created' />
-<parameter name='service-data.service-level-oper-status.last-rpc-action' value='assign' />
-<parameter name='service-data.service-level-oper-status.last-action' value='CreateServiceInstance' />
-</set></block></method></service-logic>
+                        </set>
+                    </for>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='service-data.service-level-oper-status.order-status' value='Created' />
+                <parameter name='service-data.service-level-oper-status.last-rpc-action' value='assign' />
+                <parameter name='service-data.service-level-oper-status.last-action' value='CreateServiceInstance' />
+            </set>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file