diff options
| author |   Brandon, Bruce (bb2697) <bb2697@att.com> | 2018-07-26 18:10:42 +0000 |
|---|---|---|
| committer | Brandon, Bruce (bb2697) <bb2697@att.com> | 2018-07-26 18:10:42 +0000 |
| commit | 5a41e5c15bdbfba0e84e89e13bb06d9930988e77 (patch) | |
| tree | 72fa804d3fc3f1e286e3c8e1209309e97a3ff528 /platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml | |
| parent | 3b79de733187d2c1c9bccf626958a43bb06dbf2e (diff) | |
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
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml')
| -rwxr-xr-x | platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml index 9454f4fc..0f27169c 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml @@ -9,6 +9,7 @@ <parameter name='eipam-ip-block.entity-id' value='' />
<parameter name='eipam-ip-block.ip-prefix' value='' />
<parameter name='eipam-ip-block.mask' value='' />
+ <parameter name='tmp.location8' value='' />
<parameter name='tmp.l3-network.level1.v4.entity-id' value='' />
<parameter name='tmp.l3-network.level1.v4.ip-prefix' value='' />
<parameter name='tmp.l3-network.level1.v4.mask' value='' />
@@ -30,6 +31,12 @@ <parameter name='tmp.l3-network.level2.v6.pool.pre-existing' value='false' />
<parameter name='tmp.l3-network.level2.v6.subnet.pre-existing' value='false' />
</set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
+ <parameter name="string" value="`$aai.complex.physical-location-id`" />
+ <parameter name="result" value="tmp.location8"/>
+ <parameter name="begin-index" value="0" />
+ <parameter name="end-index" value="8" />
+ </execute>
<set>
<parameter name='tmp.region' value='`$aai.complex.region`' />
<parameter name='tmp.cloud-region-id' value="`$aai.cloud-region.cloud-region-id`" />
@@ -42,20 +49,19 @@ <parameter name='eipam-ip-block.plans_length' value='0' />
<parameter name='eipam-pool.v4.pre-existing' value='false' />
<parameter name='eipam-pool.v6.pre-existing' value='false' />
- <parameter name="tmp.level1-key-value" value="`$aai.complex.physical-location-id + ':' + $aai.cloud-region.cloud-region-id`" />
+ <parameter name="tmp.level1-key-value" value="`$tmp.location8 + ':' + $aai.cloud-region.cloud-region-id`" />
<parameter name="tmp.level2-key-value" value="`$network-model.network-role + ':' + $tmp.l3-network.network-id`" />
<parameter name="tmp.ipv4-cidr-mask" value="`$network-model.ipv4-cidr-mask`" />
<parameter name="tmp.ipv6-cidr-mask" value="`$network-model.ipv6-cidr-mask`" />
</set>
+ <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
+ <set>
+ <parameter name="eipam-ip-block.subnet-size-override-v4" value="`$network-model.ipv4-cidr-mask`" />
+ <parameter name="eipam-ip-block.subnet-size-override-v6" value="`$network-model.ipv6-cidr-mask`" />
+ </set>
<switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
<outcome value=''>
- <block>
- <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
- <set>
- <parameter name="eipam-ip-block.subnet-size-override-v4" value="`$network-model.ipv4-cidr-mask`" />
- <parameter name="eipam-ip-block.subnet-size-override-v6" value="`$network-model.ipv6-cidr-mask`" />
- </set>
- </block>
+ <block></block>
</outcome>
<outcome value='Other'>
<block>
@@ -69,12 +75,6 @@ <parameter name='eipam-ip-block.subnet-size-override-v4' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$pidx].value`' />
</set>
</outcome>
- <outcome value='Other'>
- <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
- <set>
- <parameter name="eipam-ip-block.subnet-size-override-v4" value="`$network-model.ipv4-cidr-mask`" />
- </set>
- </outcome>
</execute>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
<parameter name="source" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$pidx].name`" />
@@ -84,12 +84,6 @@ <parameter name='eipam-ip-block.subnet-size-override-v6' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$pidx].value`' />
</set>
</outcome>
- <outcome value='Other'>
- <!--subnet and subnet_keys are deleted in the EIPAMPlugin-->
- <set>
- <parameter name="eipam-ip-block.subnet-size-override-v6" value="`$network-model.ipv6-cidr-mask`" />
- </set>
- </outcome>
</execute>
</block>
</for>
@@ -938,4 +932,4 @@ </outcome>
</switch>
</method>
-</service-logic> +</service-logic>
\ No newline at end of file |