diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-09-11 20:56:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-11 20:56:37 +0000 |
| commit | 4e2db0d6e56bc19425e6afa3efc7011820942e9e (patch) | |
| tree | 36a4232e46f141d31adf7cb0eaec014c0f2c724a /platform-logic/generic-resource-api/src/main/xml | |
| parent | a2c8ec3e4812451e2f81eee1b27eb60c1fee98dd (diff) | |
| parent | 8c90e126ea0633cb78d50a7719406d165fa8b013 (diff) | |
Merge "Add netbox-ip-assign capability at vnf level"
Former-commit-id: 874475f0264d3271837e6f8bb6bf7512a83e1eaa
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
2 files changed, 15 insertions, 13 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml index 393c7bcb..bc92ba07 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml @@ -171,13 +171,14 @@ <parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />
<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />
<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assign' />
- <parameter name='ss.capability.execution-order[6]' value='eipam-create-pool"' />
- <parameter name='ss.capability.execution-order[7]' value='mac-address-assign' />
- <parameter name='ss.capability.execution-order[8]' value='mS-mac-address-assign' />
- <parameter name='ss.capability.execution-order[9]' value='create-vpe-pool' />
- <parameter name='ss.capability.execution-order[10]' value='unresolved-composite-data' />
- <parameter name='ss.capability.execution-order[11]' value='aai-vnf-put' />
- <parameter name='ss.capability.execution-order_length' value='12' />
+ <parameter name='ss.capability.execution-order[6]' value='netbox-ip-assign' />
+ <parameter name='ss.capability.execution-order[7]' value='eipam-create-pool"' />
+ <parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />
+ <parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />
+ <parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />
+ <parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />
+ <parameter name='ss.capability.execution-order[12]' value='aai-vnf-put' />
+ <parameter name='ss.capability.execution-order_length' value='13' />
</set>
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources' value='true' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml index 517948ee..dd5bc409 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml @@ -7,12 +7,13 @@ <parameter name='ss.capability.execution-order[0]' value='mac-address-assign' />
<parameter name='ss.capability.execution-order[1]' value='mS-mac-address-assign' />
<parameter name='ss.capability.execution-order[2]' value='eipam-ip-assign' />
- <parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />
- <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />
- <parameter name='ss.capability.execution-order[5]' value='alts-license-assign' />
- <parameter name='ss.capability.execution-order[6]' value='alts-entitlement-assign' />
- <parameter name='ss.capability.execution-order[7]' value='generate-name' />
- <parameter name='ss.capability.execution-order_length' value='8' />
+ <parameter name='ss.capability.execution-order[3]' value='netbox-ip-assign' />
+ <parameter name='ss.capability.execution-order[4]' value='vlan-tag-assign' />
+ <parameter name='ss.capability.execution-order[5]' value='mS-vlan-tag-assign' />
+ <parameter name='ss.capability.execution-order[6]' value='alts-license-assign' />
+ <parameter name='ss.capability.execution-order[7]' value='alts-entitlement-assign' />
+ <parameter name='ss.capability.execution-order[8]' value='generate-name' />
+ <parameter name='ss.capability.execution-order_length' value='9' />
</set>
<set>
<parameter name='ss.capability-type' value='vnf' />
|