summaryrefslogtreecommitdiffstats
path: root/robot/resources/openstack
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-07-23 17:13:23 -0400
committerDR695H <dr695h@att.com>2019-07-23 17:13:23 -0400
commit67afaca4f14965ac90f724ec56fb87d900cf807a (patch)
tree7c16dee56cca3d7b86bb820e4892722a77d1a401 /robot/resources/openstack
parent102f3207fbec080e81d4abaa9c7277cbf5d52a37 (diff)
cleaning up some warnings
need these cleaned before switching over the variabel strucuture in preload Issue-ID: TEST-174 Change-Id: I1667f45b0135a059dfab2835c9b4f743703c60a5 Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources/openstack')
-rw-r--r--robot/resources/openstack/cinder_interface.robot6
-rw-r--r--robot/resources/openstack/heat_interface.robot4
-rw-r--r--robot/resources/openstack/keystone_interface.robot10
-rw-r--r--robot/resources/openstack/neutron_interface.robot6
-rw-r--r--robot/resources/openstack/nova_interface.robot12
5 files changed, 19 insertions, 19 deletions
diff --git a/robot/resources/openstack/cinder_interface.robot b/robot/resources/openstack/cinder_interface.robot
index ca6e62b7..cbff9401 100644
--- a/robot/resources/openstack/cinder_interface.robot
+++ b/robot/resources/openstack/cinder_interface.robot
@@ -3,7 +3,7 @@ Documentation The main interface for interacting with Openstack. It handles
Library ONAPLibrary.Openstack
Library RequestsLibrary
Library ONAPLibrary.Utilities
-Library ONAPLibrary.Templating
+Library ONAPLibrary.Templating WITH NAME Templating
Resource ../global_properties.robot
Resource openstack_common.robot
@@ -34,8 +34,8 @@ Add Openstack Volume
[Arguments] ${alias} ${name} ${size}
${uuid}= Generate UUID4
${arguments}= Create Dictionary name=${name} description=${GLOBAL_APPLICATION_ID}${uuid} size=${size} type=${OPENSTACK_CINDER_VOLUMES_TYPE} availability_zone=${OPENSTACK_CINDER_AVAILABILITY_ZONE}
- Create Environment cinder ${GLOBAL_TEMPLATE_FOLDER}
- ${data}= Apply Template cinder ${OPENSTACK_CINDER_VOLUMES_ADD_BODY_FILE} ${arguments}
+ Templating.Create Environment cinder ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Templating.Apply Template cinder ${OPENSTACK_CINDER_VOLUMES_ADD_BODY_FILE} ${arguments}
${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_CINDER_SERVICE_TYPE} ${OPENSTACK_CINDER_VOLUMES_PATH} data_path= data=${data}
Should Be Equal As Strings 200 ${resp.status_code}
[Return] ${resp.json()['volume']['id']}
diff --git a/robot/resources/openstack/heat_interface.robot b/robot/resources/openstack/heat_interface.robot
index 0362d3eb..212c1394 100644
--- a/robot/resources/openstack/heat_interface.robot
+++ b/robot/resources/openstack/heat_interface.robot
@@ -4,7 +4,7 @@ Library ONAPLibrary.Openstack
Library RequestsLibrary
Library OperatingSystem
Library Collections
-Library ONAPLibrary.Templating
+Library ONAPLibrary.Templating WITH NAME Templating
Resource ../global_properties.robot
Resource openstack_common.robot
@@ -39,7 +39,7 @@ Make Add Stack Request
${templatedata}= Template Yaml To Json ${template}
${envdata}= Env Yaml To Json ${env}
${dict}= Create Dictionary template=${templatedata} parameters=${envdata} stack_name=${name}
- Create Environment heat ${GLOBAL_TEMPLATE_FOLDER}
+ Templating.Create Environment heat ${GLOBAL_TEMPLATE_FOLDER}
${request}= Apply Template heat ${OPENSTACK_HEAT_ADD_STACK_TEMPLATE} ${dict}
Log ${request}
[Return] ${request}
diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot
index 1df6ac91..4ea86d6c 100644
--- a/robot/resources/openstack/keystone_interface.robot
+++ b/robot/resources/openstack/keystone_interface.robot
@@ -6,7 +6,7 @@ Library ONAPLibrary.Utilities
Library Collections
Library OperatingSystem
Library String
-Library ONAPLibrary.Templating
+Library ONAPLibrary.Templating WITH NAME Templating
Resource ../global_properties.robot
Resource openstack_common.robot
@@ -67,8 +67,8 @@ Get KeyStoneAuthv2 Data
[Documentation] Returns all the data for keystone auth v2 api
[Arguments] ${username} ${password} ${path}
${arguments}= Create Dictionary username=${username} password=${password} tenantId=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID}
- Create Environment keystone ${GLOBAL_TEMPLATE_FOLDER}
- ${data}= Apply Template keystone ${OPENSTACK_KEYSTONE_AUTH_v2_BODY_FILE} ${arguments}
+ Templating.Create Environment keystone ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Templating.Apply Template keystone ${OPENSTACK_KEYSTONE_AUTH_v2_BODY_FILE} ${arguments}
${data_path}= Catenate ${path}${OPENSTACK_KEYSTONE_AUTH_v2_PATH}
[Return] ${data_path} ${data}
@@ -76,8 +76,8 @@ Get KeyStoneAuthv3 Data
[Documentation] Returns all the data for keystone auth v3 api
[Arguments] ${username} ${password} ${path}
${arguments}= Create Dictionary username=${username} password=${password} domain_id=${GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID} project_name=${GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME}
- Create Environment keystone ${GLOBAL_TEMPLATE_FOLDER}
- ${data}= Apply Template keystone ${OPENSTACK_KEYSTONE_AUTH_v3_BODY_FILE} ${arguments}
+ Templating.Create Environment keystone ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Templating.Apply Template keystone ${OPENSTACK_KEYSTONE_AUTH_v3_BODY_FILE} ${arguments}
${data_path}= Catenate ${path}${OPENSTACK_KEYSTONE_AUTH_v3_PATH}
[Return] ${data_path} ${data}
diff --git a/robot/resources/openstack/neutron_interface.robot b/robot/resources/openstack/neutron_interface.robot
index 058809de..b216a4d5 100644
--- a/robot/resources/openstack/neutron_interface.robot
+++ b/robot/resources/openstack/neutron_interface.robot
@@ -3,7 +3,7 @@ Documentation The main interface for interacting with Openstack. It handles
Library ONAPLibrary.Openstack
Library RequestsLibrary
Library Collections
-Library ONAPLibrary.Templating
+Library ONAPLibrary.Templating WITH NAME Templating
Resource ../global_properties.robot
Resource openstack_common.robot
@@ -44,8 +44,8 @@ Add Openstack Network
[Documentation] Runs an Openstack Request to add a network and returns that network id of the created network
[Arguments] ${alias} ${name}
${arguments}= Create Dictionary name=${name}
- Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER}
- ${data}= Apply Template openstack ${OPENSTACK_NEUTRON_NETWORK_ADD_BODY_FILE} ${arguments}
+ Templating.Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Templating.Apply Template openstack ${OPENSTACK_NEUTRON_NETWORK_ADD_BODY_FILE} ${arguments}
${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_NEUTRON_SERVICE_TYPE} ${OPENSTACK_NEUTRON_NETWORK_PATH} data_path= data=${data}
Should Be Equal As Strings 201 ${resp.status_code}
[Return] ${resp.json()['network']['id']}
diff --git a/robot/resources/openstack/nova_interface.robot b/robot/resources/openstack/nova_interface.robot
index 52bd174c..6c576d15 100644
--- a/robot/resources/openstack/nova_interface.robot
+++ b/robot/resources/openstack/nova_interface.robot
@@ -3,7 +3,7 @@ Documentation The main interface for interacting with Openstack. It handles
Library ONAPLibrary.Openstack
Library RequestsLibrary
Library ONAPLibrary.JSON
-Library ONAPLibrary.Templating
+Library ONAPLibrary.Templating WITH NAME Templating
Library OperatingSystem
Library Collections
Resource ../global_properties.robot
@@ -31,8 +31,8 @@ Add Openstack Keypair
[Documentation] Runs an Openstack Request to add a keypair and returns the keypair name
[Arguments] ${alias} ${name} ${ssh_key}
${arguments}= Create Dictionary name=${name} publickey=${ssh_key}
- Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER}
- ${data}= Apply Template openstack ${OPENSTACK_NOVA_KEYPAIR_ADD_BODY_FILE} ${arguments}
+ Templating.Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Templating.Apply Template openstack ${OPENSTACK_NOVA_KEYPAIR_ADD_BODY_FILE} ${arguments}
${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE} ${OPENSTACK_NOVA_KEYPAIR_PATH} data_path= data=${data}
Should Be Equal As Strings 200 ${resp.status_code}
[Return] ${resp.json()['keypair']['name']}
@@ -98,8 +98,8 @@ Add Server For Image Name
${imageRef}= Get Id For Name ${images} ${imageName}
${flavorRef}= Get Id For Name ${flavors} ${flavorName}
${dict}= Create Dictionary name=${name} imageRef=${imageRef} flavorRef=${flavorRef} public_net_id=${public_net_id}
- Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER}
- ${data}= Apply Template openstack ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE} ${dict}
+ Templating.Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Templating.Apply Template openstack ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE} ${dict}
${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE} ${OPENSTACK_NOVA_SERVERS_PATH} data_path= data=${data}
${status_string}= Convert To String ${resp.status_code}
Should Match Regexp ${status_string} ^(202)$
@@ -112,7 +112,7 @@ Wait for Server to Be Active
Should Be Equal ${status} ACTIVE
[Return] ${server_info}
- Get Active Server
+Get Active Server
[Arguments] ${alias} ${server_id}
${resp}= Get Openstack Server By Id ${alias} ${server_id}
Should Be Equal As Strings ${resp.status_code} 200