Update underlay DGs for VoLTE use case

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_validate-network-input-parameters.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
index e54026d..435ecf0 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml
@@ -24,17 +24,17 @@
                                                 <parameter name="tmp.value" value="" />\r
                                             </set>\r
                                             <set>\r
-                                                <parameter name="tmp.name" value="'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name'" />\r
-                                                <parameter name="tmp.value" value="'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value'" />\r
+                                                <parameter name="tmp.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name`" />\r
+                                                <parameter name="tmp.value" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value`" />\r
                                             </set>\r
-                                            <switch test="'$tmp.name'">\r
+                                            <switch test="`$tmp.name`">\r
                                                 <outcome value="name">\r
                                                     <switch test="`$tmp.value`">\r
                                                         <outcome value="">\r
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -45,7 +45,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -56,7 +56,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -67,7 +67,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -78,7 +78,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -89,7 +89,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -100,7 +100,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -111,7 +111,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -122,7 +122,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -133,7 +133,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -144,7 +144,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -155,7 +155,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -166,7 +166,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -177,7 +177,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -188,7 +188,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -199,7 +199,7 @@
                                                             <return status="failure">\r
                                                                 <parameter name="ack-final" value="Y" />\r
                                                                 <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'" />\r
+                                                                <parameter name="error-message" value="`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`" />\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </switch>\r
@@ -244,7 +244,22 @@
                 </outcome>\r
                 <outcome value="deactivate">\r
                     <switch test="`$network-topology-operation-input.request-information.request-action`">\r
-                        <outcome value="DeActivateDCINetworkInstance" />\r
+                        <outcome value="DeActivateDCINetworkInstance">\r
+                            <block atomic="true">\r
+                                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">\r
+                                    <parameter name="$network-topology-operation-input.network-information.network-id" value="" />\r
+                                </execute>\r
+                                <switch test="`$network-topology-operation-input.network-information.network-id`">\r
+                                    <outcome value="">\r
+                                        <return status="failure">\r
+                                            <parameter name="ack-final" value="Y" />\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />\r
+                                        </return>\r
+                                    </outcome>\r
+                                </switch>\r
+                            </block>\r
+                        </outcome>\r
                         <outcome value="Other">\r
                             <return status="failure">\r
                                 <parameter name="ack-final" value="Y" />\r