diff options
| author |   shashikanth.vh <shashikanth.vh@huawei.com> | 2017-11-02 19:14:44 +0530 |
|---|---|---|
| committer | shashikanth.vh <shashikanth.vh@huawei.com> | 2017-11-02 19:14:56 +0530 |
| commit | 5f94bdd9acef79a4c4c4a8727f44b8598e6223cc (patch) | |
| tree | 4d0a40ce9cddb8aff9be59a6d7be53ef51013239 /platform-logic/generic-resource-api/src/main/xml | |
| parent | dca09f83325b3126b5135dee8b13ffc7bcd331d5 (diff) | |
Fix underlay DG testing issue
Fixed exception which occured while updating A&AI.
Few parameters(config-sub-type, operational status) missed while saving
underlay configuration to A&AI
While saving service relation to A&AI, key formed with invalid service-Id and also
missed to include global-customer-id and service-type.
https://jira.onap.org/browse/SDNC-162
Issue-Id: SDNC-162
Change-Id: I631e685fa017e82be4666fc2bb9ad601b12cafa7
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: 6bce0d3e205d274e2f5f914f40c142e59e46fa93
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml index 76a52b58..7b6df3e3 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml @@ -515,12 +515,15 @@ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $prop.l3vpn.network-id">
<parameter name="configuration-id" value="`$prop.l3vpn.network-id`" />
<parameter name="configuration-type" value="underlay" />
+ <parameter name="configuration-sub-type" value="l3vpn" />
<parameter name="orchestration-status" value="Created" />
+ <parameter name="operational-status" value="Created" />
+ <parameter name="model-customization-id" value="`$prop.l3vpn.network-id`" />
<parameter name="configuration-selflink" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.l3vpn.network-id + '/network-data/'` " />
</save>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" key="service-instance.service-instance-id = $service-data.service-information.service-id">
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" key="service-instance.service-instance-id = $service-data.service-information.service-instance-id AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type" force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="configuration" />
- <parameter name="relationship-list.relationship[0].related-link" value="/network/configurations/configuration" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.l3vpn.network-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.l3vpn.network-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[1].relationship-key" value="configuration.configuration-type" />
|