From 885b4e6f6caba1d6db67cb378ecfabd56b6da5be Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 19 Sep 2024 16:11:05 -0400 Subject: RFC-8040 migration Updates to migrate from Biermann draft version of RESTCONF to RFC 8040 version Issue-ID: SDNC-1847 Change-Id: I1837fc3613274aa0725f2d170e9346d402189f57 Signed-off-by: Dan Timoney --- csit/scripts/aaisimulator/aaiclient.properties | 4 ++-- csit/scripts/aaisimulator/wiremock/mappings/aai.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'csit/scripts/aaisimulator') diff --git a/csit/scripts/aaisimulator/aaiclient.properties b/csit/scripts/aaisimulator/aaiclient.properties index 74b5e567..453fd21e 100755 --- a/csit/scripts/aaisimulator/aaiclient.properties +++ b/csit/scripts/aaisimulator/aaiclient.properties @@ -54,8 +54,8 @@ org.onap.ccsdk.sli.adaptors.aai.update=/aai/v13/actions/update # UBB Notify org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v13/actions/notify -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/rests/data/L3SDN-API:services/layer3-service-list={service-instance-id}?content=config +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/rests/data/L3AVPN-EVC-API:services/service-list={service-instance-id}/service-data/avpn-logicalchannel-information?content=config # P-Interfaces org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v13/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces diff --git a/csit/scripts/aaisimulator/wiremock/mappings/aai.json b/csit/scripts/aaisimulator/wiremock/mappings/aai.json index 64739068..e63f7834 100755 --- a/csit/scripts/aaisimulator/wiremock/mappings/aai.json +++ b/csit/scripts/aaisimulator/wiremock/mappings/aai.json @@ -14,7 +14,7 @@ "environment-context": "General_Revenue-Bearing", "workload-context": "Testing", "resource-version": "1616417209896", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca/service-data/service-topology/", + "selflink": "rests/data/GENERIC-RESOURCE-API:services/service=5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca/service-data/service-topology?content=config", "orchestration-status": "Inventoried" } } @@ -25,7 +25,7 @@ "url": "/aai/v24/business/customers/customer/testsvc1/service-subscriptions/service-subscription/test/service-instances/service-instance/5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca?resource-version=1616417209896", "bodyPatterns": [{ "equalToJson": { - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca/service-data/service-topology/", + "selflink": "rests/data/GENERIC-RESOURCE-API:services/service=5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca/service-data/service-topology?content=config", "resource-version": "1616417209896", "service-instance-name": "zrdm61asmsf01_svc" }, -- cgit 1.2.3-korg