NNI-based Service creation DG bug fixes (uni, l2vpn, and underlay resources).

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sotn_nni / GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
index e2e61c6..1f3e0f7 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml
@@ -1,69 +1,17 @@
 <service-logic\r
-        xmlns='http://www.onap.org/sdnc/svclogic'\r
-        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}'>\r
+    xmlns='http://www.onap.org/sdnc/svclogic'\r
+    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}'>\r
     <method rpc='sotn-vf-operation-l2vpn-activate' mode='sync'>\r
         <block atomic="true">\r
-            <switch test='`$service-data.vnfs.vnf_length`'>\r
-                <outcome value='0'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />\r
-                    </return>\r
-                </outcome>\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="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='Other'>\r
-                    <block atomic="true">\r
-                        <for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                            <block>\r
-                                <switch test="`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">\r
-                                    <outcome value='true'>\r
-                                        <set>\r
-                                            <parameter name='tmp.vidx' value='`$vidx`' />\r
-                                            <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\r
-                                        </set>\r
-                                    </outcome>\r
-                                </switch>\r
-                            </block>\r
-                        </for>\r
-                    </block>\r
-                </outcome>\r
-            </switch>\r
-            <switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\r
-                <outcome value='Created'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-                <outcome value='Other'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
             <set>\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\r
+                <!--<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />-->\r
+                <!--<parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />-->\r
+                <parameter name='vnfId' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
+                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vf-module-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />\r
             </set>\r
-            <set>\r
-                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />\r
-            </set>\r
-            <set>\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\r
-            </set>\r
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                    resource="connectivity"\r
-                    key="connectivity.connectivity-id = $vnfId" >\r
+            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+       resource="connectivity"   \r
+               key="connectivity.connectivity-id = $vnfId" >\r
                 <parameter name="operational-status" value="Active" />\r
             </update>\r
             <return status='success'>\r