X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_validate-network-input.xml;h=87cf44893bf89dfd8c58650172f13c8f5837da35;hb=12c87ed2075ab6c13b85a3e0264cf45626aa04e5;hp=043c4940d81a7b5ab82edc21678f79f1b0c77db3;hpb=191aaa5c7057a62b98899c911e316fd7d364de21;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
old mode 100755
new mode 100644
index 043c4940..87cf4489
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
@@ -1,206 +1,259 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="validate-network-input" mode="sync">
+<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='validate-network-input' mode='sync'>
         <block atomic="true">
-            <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
-                <outcome value="">
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
+            <switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
                         <parameter name="error-message" value="sdnc-request-header.svc-action is a required input" />
                     </return>
                 </outcome>
             </switch>
-            <switch test="`$network-topology-operation-input.sdnc-request-header.svc-request-id`">
-                <outcome value="">
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
+            <switch test='`$network-topology-operation-input.sdnc-request-header.svc-request-id`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
                         <parameter name="error-message" value="sdnc-request-header.svc-request-id is a required input" />
                     </return>
                 </outcome>
             </switch>
-            <switch test="`$network-topology-operation-input.request-information.request-action`">
-                <outcome value="">
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
+            <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
                         <parameter name="error-message" value="request-information.request-action is a required input" />
                     </return>
                 </outcome>
             </switch>
-            <switch test="`$network-topology-operation-input.service-information.service-instance-id`">
-                <outcome value="">
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y" />
+            <switch test='`$network-topology-operation-input.service-information.service-instance-id`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
                         <parameter name="error-message" value="service-information.service-instance-id is a required input" />
                     </return>
                 </outcome>
             </switch>
-            <switch test="`$network-topology-operation-input.sdnc-request-header.svc-action`">
-                <outcome value="assign">
+            <switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>
+                <outcome value='assign'>
                     <block atomic="true">
-                        <switch test="`$network-topology-operation-input.request-information.request-action`">
-                            <outcome value="CreateNetworkInstance">
+                        <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                            <outcome value='CreateNetworkInstance'>
                                 <block atomic="true">
-                                    <switch test="`$network-topology-operation-input.network-information.network-id`">
-                                        <outcome value="" />
-                                        <outcome value="Other">
+                                    <switch test='`$network-topology-operation-input.network-information.network-id`'>
+                                        <outcome value=''>
+                                            <return status='success'>
+                                                <parameter name='' value='' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
                                             <block>
-                                                <switch test="`$service-data.networks.network_length`">
-                                                    <outcome value="">
+                                                <switch test='`$service-data.networks.network_length`'>
+                                                    <outcome value=''>
                                                         <record plugin="com.att.sdnctl.sli.recording.Slf4jRecorder">
-                                                            <parameter name="logger" value="message-log" />
-                                                            <parameter name="field1" value="__TIMESTAMP__" />
-                                                            <parameter name="field2" value="GENERIC-RESOURCE-API.validate-network-input" />
-                                                            <parameter name="field3" value="`$network-topology-operation-input.sdnc-request-header.svc-request-id`" />
-                                                            <parameter name="field4" value="Network id proveded but no network exists that matches" />
-                                                            <parameter name="field5" value="`$network-topology-operation-input.network-information.network-id`" />
+                                                            <parameter name="logger" value="message-log"/>
+                                                            <parameter name="field1" value="__TIMESTAMP__"/>
+                                                            <parameter name="field2" value="GENERIC-RESOURCE-API.validate-network-input"/>
+                                                            <parameter name="field3" value="`$network-topology-operation-input.sdnc-request-header.svc-request-id`"/>
+                                                            <parameter name="field4" value="Network id proveded but no network exists that matches"/>
+                                                            <parameter name="field5" value="`$network-topology-operation-input.network-information.network-id`"/>
                                                         </record>
                                                     </outcome>
-                                                    <outcome value="Other">
+                                                    <outcome value='Other'>
                                                         <block atomic="true">
-                                                            <for index="nidx" start="0" end="`$service-data.networks.network_length`">
+                                                            <for index='nidx' start='0' end='`$service-data.networks.network_length`' >
                                                                 <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
-                                                                    <outcome value="true">
+                                                                    <outcome value='true'>
+                                                                        <block atomic="true">
+                                                                            <set>
+                                                                                <parameter name='tmp.nidx' value='`$nidx`' />
+                                                                                <parameter name='network-data.' value='`$service-data.networks.network[$nidx].`' />
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </for>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                    <switch test='`$network-topology-operation-input.network-information.network-instance-group-id`'>
+                                        <outcome value=''>
+                                            <return status='success'>
+                                                <parameter name='' value='' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <block>
+                                                <switch test='`$service-data.network-instance-groups.network-instance-group_length`'>
+                                                    <outcome value=''>
+                                                        <record plugin="com.att.sdnctl.sli.recording.Slf4jRecorder">
+                                                            <parameter name="logger" value="message-log"/>
+                                                            <parameter name="field1" value="__TIMESTAMP__"/>
+                                                            <parameter name="field2" value="GENERIC-RESOURCE-API.validate-network-input"/>
+                                                            <parameter name="field3" value="`$network-topology-operation-input.sdnc-request-header.svc-request-id`"/>
+                                                            <parameter name="field4" value="Network instance group id proveded but no network instance group exists that matches"/>
+                                                            <parameter name="field5" value="`$network-topology-operation-input.network-information.network-instance-group-id`"/>
+                                                        </record>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <block atomic="true">
+                                                            <for index='ngidx' start='0' end='`$service-data.network-instance-groups.network-instance-_length`' >
+                                                                <switch test="`$service-data.network-instance-groups.network-instance-group[$nidx].network-instance-group-id == $network-topology-operation-input.network-information.network-instance-group-id`">
+                                                                    <outcome value='true'>
                                                                         <block atomic="true">
                                                                             <set>
-                                                                                <parameter name="tmp.nidx" value="`$nidx`" />
-                                                                                <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].`" />
+                                                                                <parameter name='tmp.ngidx' value='`$ngidx`' />
+                                                                                <parameter name='ctx.network-instance-group-data.' value='`$service-data.network-instance-groups.network-instance-group[$ngidx].`' />
                                                                             </set>
                                                                         </block>
                                                                     </outcome>
                                                                 </switch>
                                                             </for>
-                                                            <switch test="`$tmp.nidx`">
-                                                                <outcome value="">
-                                                                    <return status="failure">
-                                                                        <parameter name="ack-final" value="Y" />
-                                                                        <parameter name="error-code" value="500" />
-                                                                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
-                                                                    </return>
-                                                                </outcome>
-                                                            </switch>
                                                         </block>
                                                     </outcome>
                                                 </switch>
                                             </block>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="network-information.onap-model-information.model-invariant-uuid is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="network-information.onap-model-information.model-customization-uuid is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-uuid`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="network-information.onap-model-information.model-uuid is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.network-request-input.tenant`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-request-input.tenant`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="network-request-input.tenant is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.network-request-input.aic-cloud-region`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-request-input.aic-cloud-region`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="service-information.network-request-information.aic-cloud-region is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.service-information.onap-model-information.model-uuid`">
-                                        <outcome value="">
+                                    <switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>
+                                        <outcome value=''>
                                             <block atomic="true">
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid" pfx="service-model">
-                                                    <outcome value="not-found">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'
+  pfx='service-model'>
+                                                    <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 service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
-                                                    <outcome value="failure">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
                                                             <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
                                                 </get-resource>
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid   and service_uuid = $service-data.service-information.onap-model-information.model-uuid" pfx="network-model">
-                                                    <outcome value="not-found">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+  and service_uuid = $service-data.service-information.onap-model-information.model-uuid'
+  pfx='network-model'>
+                                                    <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 network model found for customization UUID '      + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
-                                                    <outcome value="failure">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID '      + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
                                                 </get-resource>
                                             </block>
                                         </outcome>
-                                        <outcome value="Other">
+                                        <outcome value='Other'>
                                             <block atomic="true">
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid" pfx="service-model">
-                                                    <outcome value="not-found">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
+  pfx='service-model'>
+                                                    <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 service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
-                                                    <outcome value="failure">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
                                                             <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
                                                 </get-resource>
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid   and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid" pfx="network-model">
-                                                    <outcome value="not-found">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+  and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
+  pfx='network-model'>
+                                                    <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 network model found for customization UUID '      + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
-                                                    <outcome value="failure">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID '      + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
                                                 </get-resource>
@@ -209,9 +262,9 @@
                                     </switch>
                                 </block>
                             </outcome>
-                            <outcome value="Other">
-                                <return status="failure">
-                                    <parameter name="ack-final" value="Y" />
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
                                     <parameter name="error-code" value="500" />
                                     <parameter name="error-message" value="request-information.request-action is required to be CreateNetworkInstance for svc-action=assign" />
                                 </return>
@@ -219,134 +272,160 @@
                         </switch>
                     </block>
                 </outcome>
-                <outcome value="activate">
+                <outcome value='activate'>
                     <block atomic="true">
-                        <switch test="`$network-topology-operation-input.request-information.request-action`">
-                            <outcome value="ActivateDCINetworkInstance" />
-                            <outcome value="CreateNetworkInstance">
+                        <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                            <outcome value='ActivateSDWANConnectivityInstance'>
+                                <block atomic="true"></block>
+                            </outcome>
+                            <outcome value='ActivateSOTNConnectivityInstance'>
+                                <block atomic="true"></block>
+                            </outcome>
+                            <outcome value='ActivateDCINetworkInstance'>
+                                <block atomic="true"></block>
+                            </outcome>
+                            <outcome value='CreateNetworkInstance'>
                                 <block atomic="true">
-                                    <switch test="`$network-topology-operation-input.network-information.network-id`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-information.network-id`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="service-information.network-information.network-id is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="network-information.onap-model-information.model-invariant-uuid is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="network-information.onap-model-information.model-customization-uuid is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.network-information.onap-model-information.model-uuid`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="network-information.onap-model-information.model-uuid is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.network-request-input.tenant`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-request-input.tenant`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="network-request-input.tenant is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.network-request-input.aic-cloud-region`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-request-input.aic-cloud-region`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="service-information.network-request-information.aic-cloud-region is a required input" />
                                             </return>
                                         </outcome>
                                     </switch>
-                                    <switch test="`$network-topology-operation-input.service-information.onap-model-information.model-uuid`">
-                                        <outcome value="">
+                                    <switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>
+                                        <outcome value=''>
                                             <block atomic="true">
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid" pfx="service-model">
-                                                    <outcome value="not-found">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'
+  pfx='service-model'>
+                                                    <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 service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
-                                                    <outcome value="failure">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
                                                             <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
                                                 </get-resource>
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid   and service_uuid = $service-data.service-information.onap-model-information.model-uuid" pfx="network-model">
-                                                    <outcome value="not-found">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+  and service_uuid = $service-data.service-information.onap-model-information.model-uuid'
+  pfx='network-model'>
+                                                    <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 network model found for customization UUID '      + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
-                                                    <outcome value="failure">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID '      + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
                                                 </get-resource>
                                             </block>
                                         </outcome>
-                                        <outcome value="Other">
+                                        <outcome value='Other'>
                                             <block atomic="true">
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid" pfx="service-model">
-                                                    <outcome value="not-found">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
+  pfx='service-model'>
+                                                    <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 service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
-                                                    <outcome value="failure">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
                                                             <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
                                                 </get-resource>
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid   and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid" pfx="network-model">
-                                                    <outcome value="not-found">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+  and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
+  pfx='network-model'>
+                                                    <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 network model found for customization UUID '      + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
-                                                    <outcome value="failure">
-                                                        <return status="failure">
-                                                            <parameter name="ack-final" value="Y" />
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
                                                             <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value="`'No network model found for customization UUID '      + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +     ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
+                                                            <parameter name="error-message" value="`'No network model found for customization UUID ' 
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
                                                         </return>
                                                     </outcome>
                                                 </get-resource>
@@ -355,9 +434,9 @@
                                     </switch>
                                 </block>
                             </outcome>
-                            <outcome value="Other">
-                                <return status="failure">
-                                    <parameter name="ack-final" value="Y" />
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
                                     <parameter name="error-code" value="500" />
                                     <parameter name="error-message" value="request-information.request-action is required to be CreateNetworkInstance for svc-action=activate" />
                                 </return>
@@ -365,16 +444,104 @@
                         </switch>
                     </block>
                 </outcome>
-                <outcome value="deactivate">
+                <outcome value='changeassign'>
+                    <block atomic="true">
+                        <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                            <outcome value='CreateNetworkInstance'>
+                                <block atomic="true">
+                                    <switch test='`$network-topology-operation-input.network-information.network-id`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="service-information.network-information.network-id is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <switch test='`$network-topology-operation-input.network-information.from-preload`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-information.from-preload is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-information.onap-model-information.model-invariant-uuid is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-information.onap-model-information.model-customization-uuid is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-information.onap-model-information.model-uuid is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <switch test='`$network-topology-operation-input.network-request-input.tenant`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-request-input.tenant is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <switch test='`$network-topology-operation-input.network-request-input.aic-cloud-region`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="service-information.network-request-information.aic-cloud-region is a required input" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                </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="request-information.request-action is required to be CreateNetworkInstance for svc-action=changeassign" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='deactivate'>
                     <block atomic="true">
-                        <switch test="`$network-topology-operation-input.request-information.request-action`">
-                            <outcome value="DeActivateDCINetworkInstance" />
-                            <outcome value="DeleteNetworkInstance">
+                        <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                            <outcome value='DeactivateSDWANConnectivityInstance'>
+                                <block atomic="true"></block>
+                            </outcome>
+                            <outcome value='DeactivateSOTNConnectivityInstance'>
+                                <block atomic="true"></block>
+                            </outcome>
+                            <outcome value='DeActivateDCINetworkInstance'>
+                                <block atomic="true"></block>
+                            </outcome>
+                            <outcome value='DeleteNetworkInstance'>
                                 <block atomic="true">
-                                    <switch test="`$network-topology-operation-input.network-information.network-id`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-information.network-id`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="service-information.network-information.network-id is a required input" />
                                             </return>
@@ -382,9 +549,9 @@
                                     </switch>
                                 </block>
                             </outcome>
-                            <outcome value="Other">
-                                <return status="failure">
-                                    <parameter name="ack-final" value="Y" />
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
                                     <parameter name="error-code" value="500" />
                                     <parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=deactivate" />
                                 </return>
@@ -392,15 +559,15 @@
                         </switch>
                     </block>
                 </outcome>
-                <outcome value="unassign">
+                <outcome value='unassign'>
                     <block atomic="true">
-                        <switch test="`$network-topology-operation-input.request-information.request-action`">
-                            <outcome value="DeleteNetworkInstance">
+                        <switch test='`$network-topology-operation-input.request-information.request-action`'>
+                            <outcome value='DeleteNetworkInstance'>
                                 <block atomic="true">
-                                    <switch test="`$network-topology-operation-input.network-information.network-id`">
-                                        <outcome value="">
-                                            <return status="failure">
-                                                <parameter name="ack-final" value="Y" />
+                                    <switch test='`$network-topology-operation-input.network-information.network-id`'>
+                                        <outcome value=''>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
                                                 <parameter name="error-code" value="500" />
                                                 <parameter name="error-message" value="service-information.network-information.network-id is a required input" />
                                             </return>
@@ -408,9 +575,9 @@
                                     </switch>
                                 </block>
                             </outcome>
-                            <outcome value="Other">
-                                <return status="failure">
-                                    <parameter name="ack-final" value="Y" />
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
                                     <parameter name="error-code" value="500" />
                                     <parameter name="error-message" value="request-information.request-action is required to be DeleteNetworkInstance for svc-action=unassign" />
                                 </return>
@@ -419,11 +586,11 @@
                     </block>
                 </outcome>
             </switch>
-            <return status="success">
+            <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
                 <parameter name="error-message" value="`$error-message`" />
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>