aboutsummaryrefslogtreecommitdiffstats
path: root/test/vcpe/vcpecommon.py
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-11-06 13:22:53 -0500
committerDaniel Rose <dr695h@att.com>2019-11-14 17:01:50 +0000
commit9b3d6ca160649ebd23c5646b2a24af0e86aa21fa (patch)
tree4e366e8400a7c63b3a56990561c05358c1a308f5 /test/vcpe/vcpecommon.py
parent48e2fd833c8ef9ea59f7312f5aea2cd9a2a22f1e (diff)
Initial GRA_API Support
Updated after testing in integration-release-daily Issue-ID: INT-1345 Change-Id: I61410e97d244ec7a736722727e11764fb5f3f5a9 Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'test/vcpe/vcpecommon.py')
-rwxr-xr-xtest/vcpe/vcpecommon.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py
index 58f91a777..371029e19 100755
--- a/test/vcpe/vcpecommon.py
+++ b/test/vcpe/vcpecommon.py
@@ -30,7 +30,12 @@ class VcpeCommon:
#############################################################################################
# set the openstack cloud access credentials here
- oom_mode = False
+ oom_mode = True
+
+ #############################################################################################
+ # set the gra_api flag
+ #gra_api_flag= False
+ gra_api_flag= True
###########################
# set Openstack credentials
@@ -40,10 +45,10 @@ class VcpeCommon:
'--os-username': 'kxi',
'--os-user-domain-id': 'default',
'--os-project-domain-id': 'default',
- '--os-tenant-id': 'bc43d50ffcb84750bac0c1707a9a765b' if oom_mode else '1e097c6713e74fd7ac8e4295e605ee1e',
+ '--os-tenant-id': '712b6016580e410b9abfec9ca34953ce' if oom_mode else '1e097c6713e74fd7ac8e4295e605ee1e',
'--os-region-name': 'RegionOne',
'--os-password': 'n3JhGMGuDzD8',
- '--os-project-domain-name': 'Integration-SB-03' if oom_mode else 'Integration-SB-07',
+ '--os-project-domain-name': 'Integration-Release-Daily' if oom_mode else 'Integration-SB-07',
'--os-identity-api-version': '3'
}
@@ -51,8 +56,8 @@ class VcpeCommon:
# set oam and public network which must exist in openstack before deployment
# CHANGEME part
common_preload_config = {
- 'oam_onap_net': 'oam_network_2No2' if oom_mode else 'oam_onap_lAky',
- 'oam_onap_subnet': 'oam_network_2No2' if oom_mode else 'oam_onap_lAky',
+ 'oam_onap_net': 'oam_network_exxC' if oom_mode else 'oam_onap_lAky',
+ 'oam_onap_subnet': 'oam_network_exxC' if oom_mode else 'oam_onap_lAky',
'public_net': 'external',
'public_net_id': '971040b2-7059-49dc-b220-4fab50cb2ad4'
}
@@ -176,6 +181,8 @@ class VcpeCommon:
self.sdnc_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
self.sdnc_preload_network_url = 'https://' + self.hosts['sdnc'] + \
':' + self.sdnc_preloading_port + '/restconf/operations/VNF-API:preload-network-topology-operation'
+ self.sdnc_preload_network_gra_url = 'https://' + self.hosts['sdnc'] + \
+ ':' + self.sdnc_preloading_port + '/restconf/operations/GENERIC-RESOURCE-API:preload-network-topology-operation'
self.sdnc_preload_vnf_url = 'https://' + self.hosts['sdnc'] + \
':' + self.sdnc_preloading_port + '/restconf/operations/VNF-API:preload-vnf-topology-operation'
self.sdnc_preload_gra_url = 'https://' + self.hosts['sdnc'] + \