Re-attaching VoLTE and CCVPN DGs

Changes include:
Changes to main DG to re-attach VoLTE and CCVPN sub DGs.

Change-Id: I217708ac49d34706cd2f6f12c68c2929248abd96
Issue-ID: SDNC-356
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: 5d3980c28f3c5d16d49f8a6edacfacc0b161d01e

1 files changed, 36 insertions, 24 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 3b300943..c24fadbb 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,12 @@
                 <outcome value='activate'>

                     <block atomic="true">

                         <switch test='`$network-topology-operation-input.request-information.request-action`'>

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

@@ -335,8 +341,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'/>

@@ -353,14 +359,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>

@@ -369,7 +375,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>

@@ -380,8 +386,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'/>

@@ -398,14 +404,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>

@@ -414,7 +420,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>

@@ -518,6 +524,12 @@
                 <outcome value='deactivate'>

                     <block atomic="true">

                         <switch test='`$network-topology-operation-input.request-information.request-action`'>

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