Generic resource API DG catch up

Generic resource API DG catch up with several new capabilities

Change-Id: I6ba4a1716693a2fb0ba5314f60038277a50249a3
Issue-ID: SDNC-403
Signed-off-by: Brandon, Bruce (bb2697) <bb2697@att.com>

Former-commit-id: dd97cf829ce1c0b3bbb0e98e93a2e6619d945beb

1 files changed, 136 insertions, 97 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-panorama-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-panorama-name.xml
index dde17098..b31a9ff6 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-panorama-name.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-panorama-name.xml
@@ -1,97 +1,136 @@
-<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='generate-panorama-name' mode='sync'>

-<block atomic="true"><set>

-<parameter name='tmp.trust-sz' value='$TenantOAMNetworkRole_$LandingNetworkRole_T' />

-<parameter name='tmp.untrust-sz' value='$TenantOAMNetworkRole_$LandingNetworkRole_U' />

-</set><set>

-<parameter name='original-name' value='`$security-zone-topology-operation-input.security-zone-request-input.untrusted-network-role`' />

-</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >

-    <parameter name="original_string" value="`$original-name`" />

-    <parameter name="regex" value="\."/>

-    <parameter name="limit" value="2" />

-    <parameter name="ctx_memory_result_key" value="splits" />

-  

-</execute><switch test='`$splits_length`'>

-<outcome value='1'>

-<set>

-<parameter name='new-name' value='`$splits[0]`' />

-</set></outcome><outcome value='2'>

-<set>

-<parameter name='new-name' value='`$splits[1]`' />

-</set></outcome><outcome value='Other'>

-<return status='failure'>

-<parameter name='error-code' value='500' />

-<parameter name='error-message' value='Unexpected network role used for panorama naming' />

-</return></outcome></switch><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='getLength' >

-    <parameter name="source" value="`$new-name`" />

-    <parameter name="outputPath" value="tmp.strlen"/>

-  

-</execute><switch test='`$tmp.strlen > 14`'>

-<outcome value='true'>

-<block atomic="true"><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring' >

-    <parameter name="string" value="`$new-name`" />

-    <parameter name="result" value="new-name"/>

-    <parameter name="begin-index" value="0" />

-    <parameter name="end-index" value="14" />

-  

-</execute></block></outcome><outcome value='false'>

-<block atomic="true"><set>

-<parameter name='new-name' value='`$new-name`' />

-</set></block></outcome></switch><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$tmp.trust-sz`"/>

-    <parameter name="outputPath" value="tmp.trust-sz"/>

-    <parameter name="target" value="$TenantOAMNetworkRole"/>

-    <parameter name="replacement" value="`$new-name`"/>

-

-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$tmp.untrust-sz`"/>

-    <parameter name="outputPath" value="tmp.untrust-sz"/>

-    <parameter name="target" value="$TenantOAMNetworkRole"/>

-    <parameter name="replacement" value="`$new-name`"/>

-

-</execute><set>

-<parameter name='original-name' value='`$security-zone-topology-operation-input.security-zone-request-input.trusted-network-role`' />

-</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >

-    <parameter name="original_string" value="`$original-name`" />

-    <parameter name="regex" value="\."/>

-    <parameter name="limit" value="2" />

-    <parameter name="ctx_memory_result_key" value="splits" />

-  

-</execute><switch test='`$splits_length`'>

-<outcome value='1'>

-<set>

-<parameter name='new-name' value='`$splits[0]`' />

-</set></outcome><outcome value='2'>

-<set>

-<parameter name='new-name' value='`$splits[1]`' />

-</set></outcome><outcome value='Other'>

-<return status='failure'>

-<parameter name='error-code' value='500' />

-<parameter name='error-message' value='Unexpected network role used for panorama naming' />

-</return></outcome></switch><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='getLength' >

-    <parameter name="source" value="`$new-name`" />

-    <parameter name="outputPath" value="tmp.strlen"/>

-  

-</execute><switch test='`$tmp.strlen > 14`'>

-<outcome value='true'>

-<block atomic="true"><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring' >

-    <parameter name="string" value="`$new-name`" />

-    <parameter name="result" value="new-name"/>

-    <parameter name="begin-index" value="0" />

-    <parameter name="end-index" value="14" />

-  

-</execute></block></outcome><outcome value='false'>

-<block atomic="true"><set>

-<parameter name='new-name' value='`$new-name`' />

-</set></block></outcome></switch><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$tmp.trust-sz`"/>

-    <parameter name="outputPath" value="tmp.trust-sz"/>

-    <parameter name="target" value="$LandingNetworkRole"/>

-    <parameter name="replacement" value="`$new-name`"/>

-

-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

-    <parameter name="source" value="`$tmp.untrust-sz`"/>

-    <parameter name="outputPath" value="tmp.untrust-sz"/>

-    <parameter name="target" value="$LandingNetworkRole"/>

-    <parameter name="replacement" value="`$new-name`"/>

-

-</execute></block></method></service-logic>
+<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='generate-panorama-name' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='tmp.trust-sz' value='$TenantOAMNetworkRole_$LandingNetworkRole_T' />
+                <parameter name='tmp.untrust-sz' value='$TenantOAMNetworkRole_$LandingNetworkRole_U' />
+            </set>
+            <set>
+                <parameter name='original-name' value='`$security-zone-topology-operation-input.security-zone-request-input.untrusted-network-role`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value="`$original-name`" />
+                <parameter name="regex" value="\."/>
+                <parameter name="limit" value="2" />
+                <parameter name="ctx_memory_result_key" value="splits" />
+            </execute>
+            <switch test='`$splits_length`'>
+                <outcome value='1'>
+                    <set>
+                        <parameter name='new-name' value='`$splits[0]`' />
+                    </set>
+                </outcome>
+                <outcome value='2'>
+                    <set>
+                        <parameter name='new-name' value='`$splits[1]`' />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='500' />
+                        <parameter name='error-message' value='Unexpected network role used for panorama naming' />
+                    </return>
+                </outcome>
+            </switch>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='getLength' >
+                <parameter name="source" value="`$new-name`" />
+                <parameter name="outputPath" value="tmp.strlen"/>
+            </execute>
+            <switch test='`$tmp.strlen > 14`'>
+                <outcome value='true'>
+                    <block atomic="true">
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring' >
+                            <parameter name="string" value="`$new-name`" />
+                            <parameter name="result" value="new-name"/>
+                            <parameter name="begin-index" value="0" />
+                            <parameter name="end-index" value="14" />
+                        </execute>
+                    </block>
+                </outcome>
+                <outcome value='false'>
+                    <block atomic="true">
+                        <set>
+                            <parameter name='new-name' value='`$new-name`' />
+                        </set>
+                    </block>
+                </outcome>
+            </switch>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$tmp.trust-sz`"/>
+                <parameter name="outputPath" value="tmp.trust-sz"/>
+                <parameter name="target" value="$TenantOAMNetworkRole"/>
+                <parameter name="replacement" value="`$new-name`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$tmp.untrust-sz`"/>
+                <parameter name="outputPath" value="tmp.untrust-sz"/>
+                <parameter name="target" value="$TenantOAMNetworkRole"/>
+                <parameter name="replacement" value="`$new-name`"/>
+            </execute>
+            <set>
+                <parameter name='original-name' value='`$security-zone-topology-operation-input.security-zone-request-input.trusted-network-role`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                <parameter name="original_string" value="`$original-name`" />
+                <parameter name="regex" value="\."/>
+                <parameter name="limit" value="2" />
+                <parameter name="ctx_memory_result_key" value="splits" />
+            </execute>
+            <switch test='`$splits_length`'>
+                <outcome value='1'>
+                    <set>
+                        <parameter name='new-name' value='`$splits[0]`' />
+                    </set>
+                </outcome>
+                <outcome value='2'>
+                    <set>
+                        <parameter name='new-name' value='`$splits[1]`' />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='500' />
+                        <parameter name='error-message' value='Unexpected network role used for panorama naming' />
+                    </return>
+                </outcome>
+            </switch>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='getLength' >
+                <parameter name="source" value="`$new-name`" />
+                <parameter name="outputPath" value="tmp.strlen"/>
+            </execute>
+            <switch test='`$tmp.strlen > 14`'>
+                <outcome value='true'>
+                    <block atomic="true">
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring' >
+                            <parameter name="string" value="`$new-name`" />
+                            <parameter name="result" value="new-name"/>
+                            <parameter name="begin-index" value="0" />
+                            <parameter name="end-index" value="14" />
+                        </execute>
+                    </block>
+                </outcome>
+                <outcome value='false'>
+                    <block atomic="true">
+                        <set>
+                            <parameter name='new-name' value='`$new-name`' />
+                        </set>
+                    </block>
+                </outcome>
+            </switch>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$tmp.trust-sz`"/>
+                <parameter name="outputPath" value="tmp.trust-sz"/>
+                <parameter name="target" value="$LandingNetworkRole"/>
+                <parameter name="replacement" value="`$new-name`"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                <parameter name="source" value="`$tmp.untrust-sz`"/>
+                <parameter name="outputPath" value="tmp.untrust-sz"/>
+                <parameter name="target" value="$LandingNetworkRole"/>
+                <parameter name="replacement" value="`$new-name`"/>
+            </execute>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file