From 2a88c3c5b5cb6650bd1cc72f0280e31998f6eb00 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Fri, 18 May 2018 10:52:55 -0700 Subject: Fix AAI mocking call for Multicloud HPA CSIT The get_vim_by_id multicloud method has been changed in I8d23764be1da82d8298f84cbe1a95427dc26c333 which impacts the HA CSIT testing. This patch addresses that change including the /cloud-infrastructure/cloud-regions/cloud-region/%s/%s/esr-system-info-list endpoint Change-Id: I1100cbfdd76048165246519a561560699e518719 Signed-off-by: Victor Morales Issue-ID: MULTICLOUD-232 --- test/csit/scripts/multicloud-ocata/generic_sim/aai/responses.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/csit/scripts/multicloud-ocata/generic_sim/aai/responses.yml b/test/csit/scripts/multicloud-ocata/generic_sim/aai/responses.yml index b17b095c4..f6d5fcd08 100644 --- a/test/csit/scripts/multicloud-ocata/generic_sim/aai/responses.yml +++ b/test/csit/scripts/multicloud-ocata/generic_sim/aai/responses.yml @@ -161,9 +161,14 @@ aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/ten body: '' content_type: application/json status_code: 200 -aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne?depth=1: +aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne: + GET: + body: '{"cloud-owner":"CloudOwner","cloud-region-id":"RegionOne","cloud-type":"openstack","owner-defined-type":"t1","cloud-region-version":"RegionOne","identity-url":"http://multicloud-ocata:80/api/multicloud-titanium_cloud/v0/CloudOwner_RegionOne/identity/v2.0","cloud-zone":"z1","complex-name":"clli1","sriov-automation":false,"cloud-extra-info":"","resource-version":"1524845276291"}' + content_type: application/json + status_code: 200 +aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/esr-system-info-list: GET: - body: '{"cloud-owner":"CloudOwner","cloud-region-id":"RegionOne","cloud-type":"openstack","owner-defined-type":"t1","cloud-region-version":"RegionOne","identity-url":"http://multicloud-ocata:80/api/multicloud-titanium_cloud/v0/CloudOwner_RegionOne/identity/v2.0","cloud-zone":"z1","complex-name":"clli1","sriov-automation":false,"cloud-extra-info":"","resource-version":"1524845276291","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"4ce895ad-82f7-4476-b5eb-d19d19585da2","service-url":"http://keystone:8080/v3","user-name":"admin","password":"secret","system-type":"VIM","ssl-insecure":true,"cloud-domain":"Default","default-tenant":"admin","resource-version":"1524845155617"}]}}' + body: '{"esr-system-info":[{"esr-system-info-id":"4ce895ad-82f7-4476-b5eb-d19d19585da2","service-url":"http://keystone:8080/v3","user-name":"admin","password":"secret","system-type":"VIM","ssl-insecure":true,"cloud-domain":"Default","default-tenant":"admin","resource-version":"1524845155617"}]}' content_type: application/json status_code: 200 aai/v13/cloud-infrastructure/pservers/pserver/compute-0: -- cgit 1.2.3-korg