Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
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-uni-create.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
index e582fb7..9648bb6 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml
@@ -3,33 +3,9 @@
     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-uni-create' mode='sync'>\r
         <block atomic="true">\r
-            <switch test='`$service-data.vnfs.vnf_length`'>\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="404" />\r
-                        <parameter name="error-message" value="There are no VNFs in MD-SAL" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
-            <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                <switch test="`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`">\r
-                    <outcome value='true'>\r
-                        <set>\r
-                            <parameter name='vnf-index' value='`$idx`' />\r
-                        </set>\r
-                    </outcome>\r
-                </switch>\r
-            </for>\r
-            <switch test='`$vnf-index`'>\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 id not found in service-data" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
+            <set>\r
+                <parameter name='vnf-index' value='0' />\r
+            </set>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value=''>\r
                     <set>\r
@@ -87,6 +63,7 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-request-input.' value='`$vf-module-topology-operation-input.vf-module-request-input.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-topology.' value='`$tmp.vf-module-topology.`' />\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length' value='`$vf-index+1`' />\r
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />\r
             </set>\r
             <set>\r
                 <parameter name='vf-module-id' value='`$prop.vf-id`'/>\r
@@ -95,7 +72,7 @@
  + '/service-data/vnfs/vnf/'\r
  + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
  + '/vnf-data/vf-modules/vf-module/'\r
- + $vf-module-topology-operation-input.vf-module-information.vf-module-id\r
+ + $prop.vf-id\r
  + '/vf-module-data/vf-module-topology/'`"/>\r
                 <parameter name='vnf-object-path'\r
  value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
@@ -107,6 +84,7 @@
  value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/service-topology/'`"/>\r
+                <!--+ $vf-module-topology-operation-input.vf-module-information.vf-module-id-->\r
             </set>\r
             <set>\r
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-index].vf-module-data.vf-module-level-oper-status.order-status'  value='Created' />\r
@@ -116,32 +94,28 @@
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \r
       key='uni.id = $prop.vf-id' >\r
                 <parameter name="id" value="`$prop.vf-id`" />\r
-                <parameter name="tpId" value='`$prop.uni.tpId`' />\r
-                <parameter name='cVLAN' value='`$prop.uni.vlanId`' />\r
+                <parameter name="tp-id" value='`$prop.uni.tp-id`' />\r
+                <parameter name='cVLAN' value='`$prop.uni.cVLAN`' />\r
                 <parameter name='operational-status' value='Created' />\r
                 <parameter name='model-customization-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`' />\r
                 <parameter name='model-invariant-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-invariant-uuid`' />\r
                 <parameter name='model-version-id' value='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-uuid`' />\r
                 <parameter name='selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vf-module-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $service-data.vnfs.vnf[$vnf-index].vnf-id  + '/vnf-data/vf-modules/vf-module/' + $prop.vf-id + '/vf-module-data/'` " />\r
             </save>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="generic-vnf" \r
-               key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
-               AND depth = '0'"\r
-        pfx='tmp.aai.generic-vnf' local-only='false' >\r
-                <outcome value='success'>\r
-                    <set>\r
-                        <parameter name='tmp.relationship_length' value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>\r
-                    </set>\r
-                </outcome>\r
-            </get-resource>\r
+            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' -->\r
+            <!--      key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\r
+            <!--      force="true" pfx="tmp.AnAI-data">-->\r
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].related-to`" value="uni" />-->\r
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].related-link`" value="`'/network/unis/uni/' + $prop.vf-id`" />-->\r
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`" value="id" />-->\r
+            <!--<parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`" value="`$prop.vf-id`" />-->\r
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list' \r
       key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' \r
       force="true" pfx="tmp.AnAI-data">\r
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].related-to`" value="uni" />\r
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].related-link`" value="`'/network/unis/uni/' + $prop.vf-id`" />\r
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-key`" value="id" />\r
-                <parameter name="`relationship-list.relationship[$tmp.relationship_length].relationship-data[0].relationship-value`" value="`$prop.vf-id`" />\r
+                <parameter name="relationship-list.relationship[0].related-to" value="uni" />\r
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $prop.vf-id`" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="id" />\r
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.vf-id`" />\r
             </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
SDNC OA&M tools