Fix vCPE GRA Network

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml
index 013219d..b0eb3f6 100755 (executable)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign-from-preload.xml
@@ -74,9 +74,6 @@
                     </return>\r
                 </outcome>\r
             </execute>\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
-                <parameter name='filename' value='/var/tmp/lmr-nto.log' />\r
-            </execute>\r
             <set>\r
                 <parameter name="tmp.error-message" value=""/>\r
             </set>\r
@@ -91,12 +88,6 @@
                         <parameter name="error-message" value="'Error searching for l3-network with network-name =' + $tmp.network-instance-name + 'from AnAI'" />\r
                     </return>\r
                 </outcome>\r
-                <outcome value='success'>\r
-                    <return status='failure'>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="'Error l3-network with network-name =' + $tmp.network-instance-name + ' already exists in AnAI'" />\r
-                    </return>\r
-                </outcome>\r
             </get-resource>\r
             <set>\r
                 <parameter name='tmp.l3-network.network-name' value="`$tmp.network-instance-name`" />\r
@@ -128,75 +119,9 @@
                 <parameter name="service-data.networks.network[$nidx].network-data.network-information.from-preload" value='true' />\r
                 <parameter name="service-data.networks.network[$nidx].network-data.network-information.network-type" value='`$tmp.l3-network.network-type`' />\r
             </set>\r
-            <switch test='`$tmp.l3-network.service-id`'>\r
-                <outcome value=''>\r
-                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="l3-network" \r
-               key="l3-network.network-id = $tmp.l3-network.network-id" >\r
-                        <!-- Create l3-network object -->\r
-                        <parameter name="network-id" value="`$tmp.l3-network.network-id`" />\r
-                        <parameter name="network-name" value="`$tmp.network-instance-name`" />\r
-                        <parameter name='network-type' value="`$tmp.l3-network.network-type`" />\r
-                        <parameter name='network-role' value="`$tmp.l3-network.network-role`" />\r
-                        <parameter name='network-technology' value="`$network-model.network-technology`" />\r
-                        <parameter name="is-bound-to-vpn" value="`$tmp.l3-network.is-bound-to-vpn-boolean`" />\r
-                        <parameter name="tenant-id" value="`$network-topology-operation-input.network-request-input.tenant`" />\r
-                        <parameter name="network-role-instance" value="0" />\r
-                        <parameter name="orchestration-status" value="PendingCreate" />\r
-                        <parameter name="physical-network-name" value="`$preload-data.preload-network-topology-information.physical-network-name`" />\r
-                        <parameter name="is-provider-network" value="`$preload-data.preload-network-topology-information.is-provider-network`" />\r
-                        <parameter name="is-shared-network" value="`$preload-data.preload-network-topology-information.is-shared-network`" />\r
-                        <parameter name="is-external-network" value="`$preload-data.preload-network-topology-information.is-external-network`" />\r
-                        <parameter name="selflink" value="`$tmp.l3-network.self-link`" />\r
-                        <outcome value='failure'>\r
-                            <return status='failure'>\r
-                                <parameter name='error-code' value='500'/>\r
-                                <parameter name='error-message' value="`'Failed to save l3-network in AnAI with network-id = ' + $tmp.return.generate-l3network-network-id.uuid`"/>\r
-                            </return>\r
-                        </outcome>\r
-                        <outcome value='not-found'>\r
-                            <return status='failure'>\r
-                                <parameter name='error-code' value='500'/>\r
-                                <parameter name='error-message' value="`'Failed to save l3-network in AnAI with network-id = ' + $tmp.return.generate-l3network-network-id.uuid`"/>\r
-                            </return>\r
-                        </outcome>\r
-                    </save>\r
-                </outcome>\r
-                <outcome value='Other'>\r
-                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="l3-network" \r
-               key="l3-network.network-id = $tmp.l3-network.network-id" >\r
-                        <!-- Create l3-network object -->\r
-                        <parameter name="network-id" value="`$tmp.l3-network.network-id`" />\r
-                        <parameter name="network-name" value="`$tmp.network-instance-name`" />\r
-                        <parameter name='network-type' value="`$network-model.network-type`" />\r
-                        <parameter name='network-role' value="`$network-model.network-role`" />\r
-                        <parameter name='network-technology' value="`$network-model.network-technology`" />\r
-                        <parameter name='is-bound-to-vpn' value="`$network-model.is-bound-to-vpn`" />\r
-                        <parameter name="service-id" value="`$network-topology-operation-input.service-information.service-id`" />\r
-                        <parameter name="tenant-id" value="`$network-topology-operation-input.network-request-input.tenant`" />\r
-                        <parameter name="network-role-instance" value="0" />\r
-                        <parameter name="orchestration-status" value="PendingCreate" />\r
-                        <parameter name="physical-network-name" value="`$preload-data.preload-network-topology-information.physical-network-name`" />\r
-                        <parameter name="is-provider-network" value="`$preload-data.preload-network-topology-information.is-provider-network`" />\r
-                        <parameter name="is-shared-network" value="`$preload-data.preload-network-topology-information.is-shared-network`" />\r
-                        <parameter name="is-external-network" value="`$preload-data.preload-network-topology-information.is-external-network`" />\r
-                        <parameter name="selflink" value="`$tmp.l3-network.self-link`" />\r
-                        <outcome value='failure'>\r
-                            <return status='failure'>\r
-                                <parameter name='error-code' value='500'/>\r
-                                <parameter name='error-message' value="`'Failed to save l3-network in AnAI with network-id = ' + $tmp.return.generate-l3network-network-id.uuid`"/>\r
-                            </return>\r
-                        </outcome>\r
-                        <outcome value='not-found'>\r
-                            <return status='failure'>\r
-                                <parameter name='error-code' value='500'/>\r
-                                <parameter name='error-message' value="`'Failed to save l3-network in AnAI with network-id = ' + $tmp.return.generate-l3network-network-id.uuid`"/>\r
-                            </return>\r
-                        </outcome>\r
-                    </save>\r
-                </outcome>\r
-            </switch>\r
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
+                <parameter name='filename' value='/var/tmp/lmr-nto.log' />\r
+            </execute>\r
             <switch test="`$preload-data.preload-network-topology-information.subnets_length`">\r
                 <outcome value=''>\r
                     <set>\r
@@ -944,9 +869,7 @@
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\r
                 <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\r
             </set>\r
-            <return status='success'>\r
-                <parameter name='' value='' />\r
-            </return>\r
+            <return status='success' ></return>\r
         </block>\r
     </method>\r
-</service-logic>
\ No newline at end of file
+</service-logic>\r