1 files changed, 31 insertions, 25 deletions
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
index c24fadbb..87cf4489 100644
--- 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
@@ -172,8 +172,8 @@
                                         <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'>
+  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'/>
@@ -190,14 +190,14 @@
                                                     </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
+  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'>
+  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 '
+                                                            <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>
@@ -206,7 +206,7 @@
                                                         <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 '
+                                                            <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>
@@ -217,8 +217,8 @@
                                         <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'>
+  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'/>
@@ -235,14 +235,14 @@
                                                     </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
+  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'>
+  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 '
+                                                            <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>
@@ -251,7 +251,7 @@
                                                         <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 '
+                                                            <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>
@@ -275,6 +275,9 @@
                 <outcome value='activate'>
                     <block atomic="true">
                         <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>
@@ -341,8 +344,8 @@
                                         <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'>
+  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'/>
@@ -359,14 +362,14 @@
                                                     </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
+  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'>
+  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 '
+                                                            <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>
@@ -375,7 +378,7 @@
                                                         <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 '
+                                                            <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>
@@ -386,8 +389,8 @@
                                         <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'>
+  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'/>
@@ -404,14 +407,14 @@
                                                     </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
+  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'>
+  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 '
+                                                            <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>
@@ -420,7 +423,7 @@
                                                         <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 '
+                                                            <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>
@@ -524,6 +527,9 @@
                 <outcome value='deactivate'>
                     <block atomic="true">
                         <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>
@@ -587,4 +593,4 @@
             </return>
         </block>
     </method>
-</service-logic>
-\ No newline at end of file
+</service-logic>