Fix SDWAN site role passed to controller

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sdwan / GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
index 15f1e53..14941e5 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-activate.xml
@@ -21,6 +21,10 @@
                     </outcome>\r
                 </switch>\r
             </for>\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
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value='0'>\r
                     <return status='failure'>\r
@@ -61,23 +65,39 @@
                 </outcome>\r
             </switch>\r
             <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
-                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == '$prop.lan.deviceName'`">\r
-                            <outcome value='true'>\r
-                                <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`">\r
-                                        <outcome value='true'>\r
-                                            <set>\r
-                                                <parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                    </switch>\r
+                <block atomic="true">\r
+                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length >= '0'`">\r
+                        <!--switch test="`$service-data.vnfs.vnf[$i].vnf-data.request-information.request-action == 'ActivateSDWANDeviceInstance'`"-->\r
+                        <outcome value='true'>\r
+                            <block atomic="true">\r
+                                <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
+                                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                        <block atomic="true">\r
+                                            <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == $prop.lan.deviceName`">\r
+                                                <outcome value='true'>\r
+                                                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'deviceId'`">\r
+                                                            <outcome value='true'>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name='prop.lan.deviceId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                                    </set>\r
+                                                                    <set>\r
+                                                                        <parameter name='site-vnf-index' value='`$vnfidx`' />\r
+                                                                    </set>\r
+                                                                </block>\r
+                                                            </outcome>\r
+                                                        </switch>\r
+                                                    </for>\r
+                                                </outcome>\r
+                                            </switch>\r
+                                        </block>\r
+                                    </for>\r
                                 </for>\r
-                            </outcome>\r
-                        </switch>\r
-                    </for>\r
-                </for>\r
+                            </block>\r
+                        </outcome>\r
+                    </switch>\r
+                </block>\r
             </for>\r
             <set>\r
                 <parameter name='prop.siteAttachements_length' value='0' />\r
@@ -86,30 +106,13 @@
             <for index='vnfidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
                 <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\r
                     <block>\r
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                            <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic24.log"/>\r
-                            <parameter name="field1" value="__TIMESTAMP__"/>\r
-                            <parameter name="field2" value="request-action"/>\r
-                            <parameter name="field3" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action`'/>\r
-                        </record>\r
                         <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
                             <outcome value='true'>\r
-                                <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                                    <block atomic="true">\r
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                            <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic23.log"/>\r
-                                            <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                            <parameter name="field2" value="param-name"/>\r
-                                            <parameter name="field3" value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name`'/>\r
-                                        </record>\r
+                                <block atomic="true">\r
+                                    <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
                                         <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'role'`">\r
                                             <outcome value='true'>\r
                                                 <block atomic="true">\r
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic22.log"/>\r
-                                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                                        <parameter name="field2" value="set spoke role"/>\r
-                                                    </record>\r
                                                     <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'sd-wan-edge'`">\r
                                                         <outcome value='true'>\r
                                                             <set>\r
@@ -117,64 +120,90 @@
                                                             </set>\r
                                                         </outcome>\r
                                                     </switch>\r
-                                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'dsvpn-hub'`">\r
+                                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value == 'dsvpn-hub'`">\r
                                                         <outcome value='true'>\r
                                                             <set>\r
                                                                 <parameter name='prop.role' value="hub" />\r
                                                             </set>\r
                                                         </outcome>\r
                                                     </switch>\r
+                                                    <for index='sidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].name == 'siteId'`">\r
+                                                            <outcome value='true'>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$sidx].value`' />\r
+                                                                    </set>\r
+                                                                    <set>\r
+                                                                        <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\r
+                                                                        <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\r
+                                                                    </set>\r
+                                                                    <set>\r
+                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\r
+                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\r
+                                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\r
+                                                                        <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\r
+                                                                    </set>\r
+                                                                </block>\r
+                                                            </outcome>\r
+                                                        </switch>\r
+                                                    </for>\r
                                                 </block>\r
                                             </outcome>\r
                                         </switch>\r
-                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`">\r
-                                            <outcome value='true'>\r
-                                                <block atomic="true">\r
-                                                    <set>\r
-                                                        <parameter name='prop.attach.siteId' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
-                                                    </set>\r
-                                                    <set>\r
-                                                        <parameter name='prop.siteIds[$prop.siteIds_length]' value='`$prop.attach.siteId`' />\r
-                                                        <parameter name='prop.siteIds_length' value='`$prop.siteIds_length + 1`' />\r
-                                                    </set>\r
-                                                    <set>\r
-                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].siteId' value='`$prop.attach.siteId`' />\r
-                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles[0]' value='`$prop.role`' />\r
-                                                        <parameter name='prop.siteAttachements[$prop.siteAttachements_length].roles_length' value='1' />\r
-                                                        <parameter name='prop.siteAttachements_length' value='`$prop.siteAttachements_length + 1`' />\r
-                                                    </set>\r
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic21.log"/>\r
-                                                        <parameter name="field1" value="__TIMESTAMP__"/>\r
-                                                        <parameter name="field2" value="prop.attach.siteId"/>\r
-                                                        <parameter name="field3" value='`$prop.attach.siteId`'/>\r
-                                                    </record>\r
-                                                </block>\r
-                                            </outcome>\r
-                                        </switch>\r
-                                    </block>\r
-                                </for>\r
+                                    </for>\r
+                                </block>\r
                             </outcome>\r
                         </switch>\r
                         <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANVpnInstance'`">\r
                             <outcome value='true'>\r
                                 <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
-                                    <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">\r
-                                        <outcome value='true'>\r
-                                            <set>\r
-                                                <parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
-                                            </set>\r
-                                        </outcome>\r
-                                    </switch>\r
+                                    <block atomic="true">\r
+                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'name'`">\r
+                                            <outcome value='true'>\r
+                                                <set>\r
+                                                    <parameter name='prop.name' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
+                                        <switch test="`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'vpn-id'`">\r
+                                            <outcome value='true'>\r
+                                                <set>\r
+                                                    <parameter name='prop.vpn1Id' value='`$service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
+                                    </block>\r
                                 </for>\r
                             </outcome>\r
                         </switch>\r
                     </block>\r
                 </for>\r
             </for>\r
+            <for index='vfidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module_length`' >\r
+                <block>\r
+                    <switch test="`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.request-information.request-action == 'ActivateSDWANSiteInstance'`">\r
+                        <outcome value='true'>\r
+                            <for index='pidx' start='0' end='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\r
+                                <block atomic="true">\r
+                                    <switch test="`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].name == 'siteId'`">\r
+                                        <outcome value='true'>\r
+                                            <block atomic="true">\r
+                                                <set>\r
+                                                    <parameter name='prop.siteId' value='`$service-data.vnfs.vnf[$site-vnf-index].vnf-data.vf-modules.vf-module[$vfidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$pidx].value`' />\r
+                                                </set>\r
+                                            </block>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                </block>\r
+                            </for>\r
+                        </outcome>\r
+                    </switch>\r
+                </block>\r
+            </for>\r
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = SDWANController AND \r
+               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \r
                     depth = '1'"\r
         pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
                 <outcome value='success'>\r
@@ -410,10 +439,10 @@
                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action'  value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />\r
             </set>\r
             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='lan-port-config' \r
-      key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
-                <parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
+      key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\r
+                <parameter name='lan-port-config-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\r
                 <parameter name='operational-status' value='Active' />\r
-                <parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' />\r
+                <!--parameter name='lan-port-config-id' value='`$prop.lan-port-config-id`' /-->\r
             </update>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r