Multiple self-serve fixes

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
index 33f6f35..5b15d65 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vf-module-assign.xml
@@ -161,7 +161,7 @@
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-rpc-action'\r
   value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.last-action'\r
-  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
+  value='`$vf-module-topology-operation-input.request-information.request-action`' />\r
                         </set>\r
                         <set>\r
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.sdnc-generated-cloud-resources' \r
@@ -179,14 +179,15 @@
                 <parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\r
                 <parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\r
                 <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\r
-                <parameter name='ss.capability.execution-order[5]' value='eipam-ip-assign' />\r
-                <parameter name='ss.capability.execution-order[6]' value='eipam-create-pool"' />\r
-                <parameter name='ss.capability.execution-order[7]' value='mac-address-assign' />\r
-                <parameter name='ss.capability.execution-order[8]' value='mS-mac-address-assign' />\r
-                <parameter name='ss.capability.execution-order[9]' value='create-vpe-pool' />\r
-                <parameter name='ss.capability.execution-order[10]' value='unresolved-composite-data' />\r
-                <parameter name='ss.capability.execution-order[11]' value='aai-vf-module-put' />\r
-                <parameter name='ss.capability.execution-order_length' value='12' />\r
+                <parameter name='ss.capability.execution-order[5]' value='eipam-ip-assignment' />\r
+                <parameter name='ss.capability.execution-order[6]' value='eipam-create-pool' />\r
+                <parameter name='ss.capability.execution-order[7]' value='netbox-ip-assign' />\r
+                <parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\r
+                <parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\r
+                <parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\r
+                <parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\r
+                <parameter name='ss.capability.execution-order[12]' value='aai-vf-module-put' />\r
+                <parameter name='ss.capability.execution-order_length' value='13' />\r
             </set>\r
             <switch test='`$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_length`'>\r
                 <outcome value=''>\r