Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Return success if no preload found
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_gw-vfmodule-update.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
index f738418..2ee6cbf 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_gw-vfmodule-update.xml
@@ -1,92 +1,110 @@
-<service-logic xmlns='http://www.onap.org/sdnc/svclogic' 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}'><method rpc='gw-vfmodule-update' mode='sync'>\r
-<block>\r
-<set>\r
-<!--\r
-<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\r
-\r
-\r
-<parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\r
+<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
+    <method rpc='gw-vfmodule-update' mode='sync'>\r
+        <block>\r
+            <set>\r
+                <!--\r
+<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' /><parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\r
 service-data.service-topology.service-topology-identifier.service-instance-id\r
 \r
 -->\r
-<parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>\r
-<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\r
-</set><set>\r
-<parameter name='tmp.thisIsVGW' value='false' />\r
-</set><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API'    \r
+                <parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>\r
+                <parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\r
+            </set>\r
+            <set>\r
+                <parameter name='tmp.thisIsVGW' value='false' />\r
+            </set>\r
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API'    \r
          key='tunnelxconn-allotted-resources/' pfx='tmp.txconns' >\r
-                                                                                                                                                                                                                                       <outcome value='success'>\r
-<for index='txidx' start='0' end='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource_length`' >\r
-\r
-\r
-<block atomic='true'><set>\r
-<parameter name='tmp.test1' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\r
-<!--\r
+                <outcome value='success'>\r
+                    <for index='txidx' start='0' end='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource_length`' >\r
+                        <block atomic='true'>\r
+                            <set>\r
+                                <parameter name='tmp.test1' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\r
+                                <!--\r
 this is null\r
 <parameter name='tmp.test2' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource-data[$txidx].tunnelxconn-topology[0].allotted-resource-identifiers[0].consuming-service-instance-id`' />\r
---></set><switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'><outcome value='true'>\r
-<block>\r
-<set>\r
-<parameter name='tmp.brg-macaddress' \r
+-->\r
+                            </set>\r
+                            <switch test='`$tmp.test1 == $tmp.consuming-service-instance-id`'>\r
+                                <outcome value='true'>\r
+                                    <block>\r
+                                        <set>\r
+                                            <parameter name='tmp.brg-macaddress' \r
       value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.brg-wan-mac-address`' />\r
-\r
-</set><set>\r
-<parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>\r
-<parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\r
-\r
-<!--\r
-<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' />\r
-<parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>\r
+                                        </set>\r
+                                        <set>\r
+                                            <parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>\r
+                                            <parameter name='tmp.consuming-service-instance-id' value='`$service-data.service-topology.service-topology-identifier.service-instance-id`' />\r
+                                            <!--\r
+<parameter name='tmp.brg-macaddress' value='fa:16:3e:8f:ea:68' /><parameter name='tmp.brg-mac-address-match' value="`'VGW2BRG-' + $tmp.brg-macaddress`"/>\r
 -->\r
-<!--\r
+                                            <!--\r
 <parameter name='tmp.consuming-service-instance-id' value='b3cb7040-f7a5-4beb-ad2f-2a893b7d374b' />\r
 service-data.service-topology.service-topology-identifier.service-instance-id\r
 \r
 -->\r
-</set><set>\r
-<parameter name='tmp.vg-vgmux-tunnel-vni' \r
+                                        </set>\r
+                                        <set>\r
+                                            <parameter name='tmp.vg-vgmux-tunnel-vni' \r
     value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />\r
-<parameter name='tmp.vg-ip' \r
+                                            <parameter name='tmp.vg-ip' \r
     value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[$txidx].allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />\r
-</set><set>\r
-<parameter name='tmp.thisIsVGW' value='true' />\r
-</set></block></outcome></switch></block></for></outcome></get-resource><switch test='`$tmp.thisIsVGW`'>\r
-<outcome value='true'>\r
-<block>\r
-<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='preload-vnfs' pfx='tmp.preloadvnfdata' >\r
-</get-resource><for index='vnfidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list_length`' >\r
-\r
-\r
-<block atomic='true'><set>\r
-<parameter name='tmp.test3' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name`' />\r
-<parameter name='tmp.test4' value='`$tmp.brg-mac-address-match`'/>\r
-\r
-\r
-</set><switch test='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name == $tmp.brg-mac-address-match`'>\r
-\r
-\r
-<outcome value='true'>\r
-<block>\r
-<set>\r
-<parameter name='tmp.endLoop1' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters_length`' /></set><for index='preloadIdx' start='0' end='`$tmp.endLoop1`'>\r
-<!--\r
+                                        </set>\r
+                                        <set>\r
+                                            <parameter name='tmp.thisIsVGW' value='true' />\r
+                                        </set>\r
+                                    </block>\r
+                                </outcome>\r
+                            </switch>\r
+                        </block>\r
+                    </for>\r
+                </outcome>\r
+            </get-resource>\r
+            <switch test='`$tmp.thisIsVGW`'>\r
+                <outcome value='true'>\r
+                    <block>\r
+                        <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='preload-vnfs' pfx='tmp.preloadvnfdata' ></get-resource>\r
+                        <for index='vnfidx' start='0' end='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list_length`' >\r
+                            <block atomic='true'>\r
+                                <set>\r
+                                    <parameter name='tmp.test3' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name`' />\r
+                                    <parameter name='tmp.test4' value='`$tmp.brg-mac-address-match`'/>\r
+                                </set>\r
+                                <switch test='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].vnf-name == $tmp.brg-mac-address-match`'>\r
+                                    <outcome value='true'>\r
+                                        <block>\r
+                                            <set>\r
+                                                <parameter name='tmp.endLoop1' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters_length`' />\r
+                                            </set>\r
+                                            <for index='preloadIdx' start='0' end='`$tmp.endLoop1`'>\r
+                                                <!--\r
 \r
      "preload-data": {\r
           "vnf-topology-information": {\r
             "vnf-parameters": [\r
             \r
             -->\r
-<block atomic='true'><set>\r
-<parameter name='tmp.vfmodule.param[$preloadIdx].name'  value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-name`' />\r
-<parameter name='tmp.vfmodule.param[$preloadIdx].value' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-value`' /></set></block></for><set>\r
-<parameter name='tmp.vfmodule.param_length' value='`$tmp.endLoop1`' />\r
-</set><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
-    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
-    <parameter name='contextPrefix' value='prop' />\r
-</execute><set>\r
-<parameter name='tmp.restapi.service.vnf.vfmodule-resource' value='`$prop.restapi.service.vnf.vfmodule-resource`' />\r
-</set><set>\r
-<parameter name='tmp.vf-module-object-path'\r
+                                                <block atomic='true'>\r
+                                                    <set>\r
+                                                        <parameter name='tmp.vfmodule.param[$preloadIdx].name'  value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-name`' />\r
+                                                        <parameter name='tmp.vfmodule.param[$preloadIdx].value' value='`$tmp.preloadvnfdata.preload-vnfs.vnf-preload-list[$vnfidx].preload-data.vnf-topology-information.vnf-parameters[$preloadIdx].vnf-parameter-value`' />\r
+                                                    </set>\r
+                                                </block>\r
+                                            </for>\r
+                                            <set>\r
+                                                <parameter name='tmp.vfmodule.param_length' value='`$tmp.endLoop1`' />\r
+                                            </set>\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                                                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                                                <parameter name='contextPrefix' value='prop' />\r
+                                            </execute>\r
+                                            <set>\r
+                                                <parameter name='tmp.restapi.service.vnf.vfmodule-resource' value='`$prop.restapi.service.vnf.vfmodule-resource`' />\r
+                                            </set>\r
+                                            <set>\r
+                                                <parameter name='tmp.vf-module-object-path'\r
  value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $service-data.service-topology.service-topology-identifier.service-instance-id\r
  + '/service-data/vnfs/vnf/'\r
@@ -94,49 +112,70 @@ service-data.service-topology.service-topology-identifier.service-instance-id
  + '/vnf-data/vf-modules/vf-module/'\r
  + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id \r
  + '/'`"/>\r
-</set><set>\r
-<!--\r
+                                            </set>\r
+                                            <set>\r
+                                                <!--\r
 <parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\r
 -->\r
-<parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vni`' />\r
-<parameter name='tmp.service.vnf.vf-module.vg-lan-ip' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vg-ip`' />\r
-\r
-\r
-\r
-</set><set>\r
-<!--\r
+                                                <parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vni`' />\r
+                                                <parameter name='tmp.service.vnf.vf-module.vg-lan-ip' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource[0].allotted-resource-data[0].tunnelxconn-topology[0].tunnelxconn-assignments[0].vg-ip`' />\r
+                                            </set>\r
+                                            <set>\r
+                                                <!--\r
 <parameter name='tmp.service.vnf.vf-module.vg-mux-tunnel-vni' value='`$input.vni`' />\r
 -->\r
-<parameter name='tmp.vg-mux-tunnel-vni-match' value='vg_vgmux_tunnel_vni' />\r
-<parameter name='tmp.vg-lan-ip-match' value='vgw_private_ip_0' />\r
-\r
-\r
-\r
-\r
-</set><for index='paramIdx' start='0' end='`$tmp.vfmodule.param_length`' >\r
-<block>\r
-<switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-mux-tunnel-vni-match`'><outcome value='true'>\r
-<set>\r
-<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.vg-vgmux-tunnel-vni`' />\r
-\r
-<!--\r
+                                                <parameter name='tmp.vg-mux-tunnel-vni-match' value='vg_vgmux_tunnel_vni' />\r
+                                                <parameter name='tmp.vg-lan-ip-match' value='vgw_private_ip_0' />\r
+                                            </set>\r
+                                            <for index='paramIdx' start='0' end='`$tmp.vfmodule.param_length`' >\r
+                                                <block>\r
+                                                    <switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-mux-tunnel-vni-match`'>\r
+                                                        <outcome value='true'>\r
+                                                            <set>\r
+                                                                <parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.vg-vgmux-tunnel-vni`' />\r
+                                                                <!--\r
 <parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni`' />\r
---></set></outcome></switch><switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-lan-ip-match`'><outcome value='true'>\r
-<set>\r
-<parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.vg-ip`' />\r
-<!--\r
+-->\r
+                                                            </set>\r
+                                                        </outcome>\r
+                                                    </switch>\r
+                                                    <switch test='`$tmp.vfmodule.param[$paramIdx].name == $tmp.vg-lan-ip-match`'>\r
+                                                        <outcome value='true'>\r
+                                                            <set>\r
+                                                                <parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.vg-ip`' />\r
+                                                                <!--\r
 <parameter name='$tmp.vfmodule.param[$paramIdx].value' value='`$tmp.txconns.tunnelxconn-allotted-resources.tunnelxconn-allotted-resource.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />\r
---></set></outcome></switch></block></for><set>\r
-<!--\r
+-->\r
+                                                            </set>\r
+                                                        </outcome>\r
+                                                    </switch>\r
+                                                </block>\r
+                                            </for>\r
+                                            <set>\r
+                                                <!--\r
 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param.'\r
 \r
                  service-data.vnfs.vnf\[0\].       vnf-data.vf-modules.vf-module\[0\]             .vf-module-data.vf-module-topology.vf-module-parameters.param.\r
    value='$tmp.vfmodule.' />\r
 -->\r
-<parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.'\r
-   value='$tmp.vfmodule.' /></set></block></outcome></switch></block></for></block></outcome><outcome value='Other'>\r
-<block>\r
-<return status='failure'>\r
-<parameter name='error-code' value='500' />\r
-<parameter name='error-message' value='Did not find vGW Preload' />\r
-</return></block></outcome></switch></block></method></service-logic>
\ No newline at end of file
+                                                <parameter name='service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameters.'\r
+   value='$tmp.vfmodule.' />\r
+                                            </set>\r
+                                        </block>\r
+                                    </outcome>\r
+                                </switch>\r
+                            </block>\r
+                        </for>\r
+                    </block>\r
+                </outcome>\r
+                <outcome value='Other'>\r
+                    <block>\r
+                        <return status='success'>\r
+                            <parameter name='' value='' />\r
+                        </return>\r
+                    </block>\r
+                </outcome>\r
+            </switch>\r
+        </block>\r
+    </method>\r
+</service-logic>
\ No newline at end of file
SDNC OA&M tools