aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-07-10 10:13:58 -0400
committerDR695H <dr695h@att.com>2019-07-10 10:13:58 -0400
commit8e7028b3ee4d18ec1916f9a68dd8587377452376 (patch)
treedf508dada6bd9a2ade634aadfdb16c0cd250a2a5
parent8ade70bdca03a5c5e3f46df70f75549de4d7b9d8 (diff)
remove log to console
log to console doesnt show things in the log files and so isnt viewable in jenkins. If console is really needed, add console=True to Log keyword Issue-ID: TEST-173 Change-Id: I9f736eab99120c4b7c32b55fd6c5e0f823e7b734 Signed-off-by: DR695H <dr695h@att.com>
-rw-r--r--robot/resources/asdc_interface.robot12
-rw-r--r--robot/resources/demo_preload.robot28
-rw-r--r--robot/resources/heatbridge.robot2
-rw-r--r--robot/resources/mr_interface.robot2
-rw-r--r--robot/resources/policy_interface.robot18
-rw-r--r--robot/resources/portal_interface.robot8
-rw-r--r--robot/resources/so/direct_instantiate.robot2
-rw-r--r--robot/resources/test_templates/closedloop_test_template.robot8
-rw-r--r--robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot20
-rw-r--r--robot/testsuites/closed-loop.robot2
10 files changed, 51 insertions, 51 deletions
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 070a12a2..a3e01d11 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -154,7 +154,7 @@ Distribute vCPEResCust Model From ASDC
${catalog_service_id}= Add ASDC Catalog Service ${catalog_service_name}_${random}
# catalog_service_name already
#${catalog_service_id}= Add ASDC Catalog Service ${catalog_service_name}
- Log To Console ${\n}ServiceName: ${catalog_service_name}_${random}
+ Log ${\n}ServiceName: ${catalog_service_name}_${random}
#${catalog_service_id}= Add ASDC Catalog Service ${catalog_service_name}
${catalog_resource_ids}= Create List
${catalog_resources}= Create Dictionary
@@ -243,7 +243,7 @@ Create Allotted Resource Data File
\ Set To Dictionary ${attrs} node_type=${json_obj['topology_template']['substitution_mappings']['node_type']}
\ Set To Dictionary ${allotted_resource} ${key}=${attrs}
${result_str}= Evaluate json.dumps(${allotted_resource}, indent=2) json
- Log To Console ${result_str}
+ Log ${result_str}
Create File /tmp/vcpe_allotted_resource_data.json ${result_str}
Download CSAR
@@ -257,7 +257,7 @@ Download CSAR
${base64Obj}= Set Variable ${resp.json()['base64Contents']}
${binObj}= Base64 Decode ${base64Obj}
Create Binary File ${save_directory}/${csar_file_name} ${binObj}
- Log To Console ${\n}Downloaded:${csar_file_name}
+ Log ${\n}Downloaded:${csar_file_name}
Get Generic NeutronNet UUID
@@ -395,7 +395,7 @@ Setup SDC Catalog Resource AllottedResource Properties
Create Environment sdc ${GLOBAL_TEMPLATE_FOLDER}
${data}= Apply Template sdc ${SDC_CATALOG_ALLOTTED_RESOURCE_PROPERTIES_TEMPLATE} ${dict}
${response}= Set ASDC Catalog Resource Component Instance Properties For Resource ${catalog_resource_id} ${componentInstance1} ${data}
- Log To Console resp=${response}
+ Log resp=${response}
Setup SDC Catalog Resource AllottedResource Inputs
@@ -433,7 +433,7 @@ Setup ASDC Catalog Resource CDS Properties
\ Create Environment sdc ${GLOBAL_TEMPLATE_FOLDER}
\ ${data}= Apply Template sdc ${ASDC_RESOURCE_INSTANCE_VNF_PROPERTIES_TEMPLATE} ${dict}
\ ${response}= Set ASDC Catalog Resource Component Instance Properties ${catalog_resource_id} ${uniqueId} ${data}
- \ Log To Console resp=${response}
+ \ Log resp=${response}
# Set vnf inputs
${resp}= Get ASDC Catalog Resource Inputs ${catalog_resource_id}
@@ -952,7 +952,7 @@ Run ASDC Health Check
:FOR ${ELEMENT} IN @{ITEMS}
\ Log ${ELEMENT['healthCheckStatus']}
\ ${SDC_DE_HEALTH} Set Variable If (('DE' in '${ELEMENT['healthCheckComponent']}') and ('${ELEMENT['healthCheckStatus']}' == 'UP')) or ('${SDC_DE_HEALTH}'=='UP') UP
- Log To Console (DMaaP:${SDC_DE_HEALTH}) no_newline=true
+ Log (DMaaP:${SDC_DE_HEALTH})
Run ASDC Get Request
[Documentation] Runs an ASDC get request
[Arguments] ${data_path} ${user}=${ASDC_DESIGNER_USER_ID} ${MY_ASDC_BE_ENDPOINT}=${ASDC_BE_ENDPOINT}
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index 49c03892..3219fa7d 100644
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -64,21 +64,21 @@ Load Models
[Documentation] Use openECOMP to Orchestrate a service.
[Arguments] ${customer_name}
Set Test Variable ${CUSTOMER_NAME} ${customer_name}
- Log To Console ${\n}Distributing vFWCL
+ Log ${\n}Distributing vFWCL
${status} ${value}= Run Keyword And Ignore Error Distribute Model vFWCL ${DEMO_PREFIX}VFWCL
- Log To Console Distibuting vLB
+ Log Distibuting vLB
${status} ${value}= Run Keyword And Ignore Error Distribute Model vLB ${DEMO_PREFIX}VLB
##${status} ${value}= Run Keyword And Ignore Error Distribute Model vCPE ${DEMO_PREFIX}VCPE
##${status} ${value}= Run Keyword And Ignore Error Distribute Model vIMS ${DEMO_PREFIX}VIMS
- Log To Console Distibuting vCPEInfra
+ Log Distibuting vCPEInfra
${status} ${value}= Run Keyword And Ignore Error Distribute Model vCPEInfra ${DEMO_PREFIX}VCPEInfra
- Log To Console Distibuting vCPEvBNG
+ Log Distibuting vCPEvBNG
${status} ${value}= Run Keyword And Ignore Error Distribute Model vCPEvBNG ${DEMO_PREFIX}VCPEvBNG
- Log To Console Distibuting vCPEvBRGEMU
+ Log Distibuting vCPEvBRGEMU
${status} ${value}= Run Keyword And Ignore Error Distribute Model vCPEvBRGEMU ${DEMO_PREFIX}VCPEvBRGEMU
- Log To Console Distibuting vCPEvGMUX
+ Log Distibuting vCPEvGMUX
${status} ${value}= Run Keyword And Ignore Error Distribute Model vCPEvGMUX ${DEMO_PREFIX}VCPEvGMUX
- Log To Console Distibuting vCPEvGW (this is not vCPEResCust service)
+ Log Distibuting vCPEvGW (this is not vCPEResCust service)
${status} ${value}= Run Keyword And Ignore Error Distribute Model vCPEvGW ${DEMO_PREFIX}VCPEvGW
Distribute Model
@@ -183,19 +183,19 @@ Instantiate VNF
Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone
${vf_module_name_list} ${service} ${generic_vnfs}= Orchestrate VNF DemoCust ${service} ${service} ${TENANT_NAME}
Save For Delete
- Log to Console Customer Name=${CUSTOMER_NAME}
+ Log Customer Name=${CUSTOMER_NAME}
:FOR ${vf_module_name} IN @{vf_module_name_list}
- \ Log To Console VNF Module Name=${vf_module_name}
+ \ Log VNF Module Name=${vf_module_name}
# Don't get from MSO for now due to SO-1186
# ${model_invariant_id}= Run MSO Get ModelInvariantId ${SUITE_SERVICE_MODEL_NAME} ${vf_module_label}
${model_invariant_id}= Set Variable ${EMPTY}
:FOR ${vf_module} IN @{generic_vnfs}
\ ${generic_vnf}= Get From Dictionary ${generic_vnfs} ${vf_module}
\ ${model_invariant_id}= Set Variable If '${vf_module_label}' in '${vf_module}' ${generic_vnf['model-invariant-id']} ${model_invariant_id}
- Log to Console Update old vFWCL Policy for ModelInvariantID=${model_invariant_id}
+ Log Update old vFWCL Policy for ModelInvariantID=${model_invariant_id}
${status} ${value}= Run Keyword And Ignore Error Update vVFWCL Policy ${model_invariant_id}
:FOR ${vf_module_name} IN @{vf_module_name_list}
- \ Log To Console APPC Mount Point for VNF Module Name=${vf_module_name}
+ \ Log APPC Mount Point for VNF Module Name=${vf_module_name}
\ ${status} ${value}= Run Keyword And Ignore Error APPC Mount Point ${vf_module_name}
Instantiate Demo VNF
@@ -203,15 +203,15 @@ Instantiate Demo VNF
Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone
${vf_module_name} ${service} ${generic_vnfs}= Orchestrate Demo VNF Demonstration ${service} ${service} ${TENANT_NAME}
#Save For Delete
- Log to Console Customer Name=${CUSTOMER_NAME}
- Log to Console VNF Module Name=${vf_module_name}
+ Log Customer Name=${CUSTOMER_NAME}
+ Log VNF Module Name=${vf_module_name}
# Don't get from MSO for now due to SO-1186
# ${model_invariant_id}= Run MSO Get ModelInvariantId ${SUITE_SERVICE_MODEL_NAME} ${vf_module_label}
${model_invariant_id}= Set Variable ${EMPTY}
:FOR ${vf_module} IN @{generic_vnfs}
\ ${generic_vnf}= Get From Dictionary ${generic_vnfs} ${vf_module}
\ ${model_invariant_id}= Set Variable If '${vf_module_label}' in '${vf_module}' ${generic_vnf['model-invariant-id']} ${model_invariant_id}
- Log to Console ModelInvariantID=${model_invariant_id}
+ Log ModelInvariantID=${model_invariant_id}
${status} ${value}= Run Keyword And Ignore Error Update vVFWCL Policy ${model_invariant_id}
${status} ${value}= Run Keyword And Ignore Error APPC Mount Point ${vf_module_name}
diff --git a/robot/resources/heatbridge.robot b/robot/resources/heatbridge.robot
index f91f9c4e..c8d6971b 100644
--- a/robot/resources/heatbridge.robot
+++ b/robot/resources/heatbridge.robot
@@ -112,7 +112,7 @@ Run Set VNF Params
${put_resp}= Run A&AI Put Request ${VERSIONED_INDEX_PATH}/network/generic-vnfs/generic-vnf/${vnf_id} ${payload_string}
${status_string}= Convert To String ${put_resp.status_code}
Should Match Regexp ${status_string} ^(200|201)$
- Log To Console Set VNF ProvStatus: ${vnf_id} to ${prov_status}
+ Log Set VNF ProvStatus: ${vnf_id} to ${prov_status}
Run Get Generic VNF By VnfId
[Documentation] Get VNF GET Payload with resource ID
diff --git a/robot/resources/mr_interface.robot b/robot/resources/mr_interface.robot
index f8ea9c3c..2c79d075 100644
--- a/robot/resources/mr_interface.robot
+++ b/robot/resources/mr_interface.robot
@@ -57,7 +57,7 @@ Run MR Update Topic Acl
Create Environment mr ${GLOBAL_TEMPLATE_FOLDER}
${data}= Apply Template mr ${MR_PUT_ACL_TEMPLATE} ${dict}
${resp}= Run MR Auth Post Request ${MR_CREATE_TOPIC_PATH} iPIxkpAMI8qTcQj8 Ehq3WyT4bkif4zwgEbvshGal ${data}
- #Log To Console Update Owner for TEST_TOPIC_ACL
+ #Log Update Owner for TEST_TOPIC_ACL
${resp}= Run MR Auth Put Request ${MR_UPDATE_ACL_TOPIC_PATH}/iPIxkpAMI8qTcQj8 iPIxkpAMI8qTcQj8 Ehq3WyT4bkif4zwgEbvshGal ${data}
Should Be Equal As Strings ${resp.status_code} 200
diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index c326760f..077edd75 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -144,30 +144,30 @@ Update vVFWCL Policy Old
[Arguments] ${resource_id}
Run Keyword and Ignore Error Delete vFWCL Policy
Sleep 20s
- Log To Console Create vFWCL Policy
+ Log Create vFWCL Policy
Create vFWCL Policy ${resource_id}
Sleep 5s
- Log To Console Push vFWCL Policy
+ Log Push vFWCL Policy
Push vFWCL Policy
Sleep 20s
- Log To Console Reboot Drools
+ Log Reboot Drools
Reboot Drools
Sleep 20s
- Log To Console Validate vFWCL Policy
+ Log Validate vFWCL Policy
Validate the vFWCL Policy Old
Update vVFWCL Policy
[Arguments] ${resource_id}
- Log To Console Create vFWCL Monitoring Policy
+ Log Create vFWCL Monitoring Policy
Create vFirewall Monitoring Policy
Sleep 5s
- Log To Console Create vFWCL Operational Policy
+ Log Create vFWCL Operational Policy
${op_policy_version}= Create vFirewall Operational Policy ${resource_id}
Sleep 5s
- Log To Console Push vFWCL To PDP Group
+ Log Push vFWCL To PDP Group
Push vFirewall Policies To PDP Group ${op_policy_version}
Sleep 20s
- Log To Console Validate vFWCL Policy
+ Log Validate vFWCL Policy
Validate the vFWCL Policy
@@ -235,7 +235,7 @@ Create vFirewall Operational Policy
${encoded_content_data}= Evaluate urllib.quote_plus('''${content_data}''') urllib
${content_dictionary}= Create Dictionary URL_ENCODED_CONTENT ${encoded_content_data}
${data_2}= Apply Template policy ${POLICY_TEMPLATES}/vFirewall_policy_operational_url_enc_content_input.jinja ${content_dictionary}
- Log To Console ${data_2}
+ Log ${data_2}
${resp}= Run Policy Api Post Request /policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies ${data_2}
Should Be Equal As Strings ${resp.status_code} 200
[Return] ${resp.json()['policy-version']}
diff --git a/robot/resources/portal_interface.robot b/robot/resources/portal_interface.robot
index 6c1cb5d9..e8a6c53c 100644
--- a/robot/resources/portal_interface.robot
+++ b/robot/resources/portal_interface.robot
@@ -50,7 +50,7 @@ Run Portal Login Tests
Run Portal Application Access Tests
[Documentation] Runs Portal Application Access Tests
- Log To Console Testing SDC,VID,Policy
+ Log Testing SDC,VID,Policy
Run Portal Application Login Test cs0008 demo123456! gridster-SDC-icon-link tabframe-SDC Welcome to SDC
Close All Browsers
Run Portal Application Login Test demo demo123456! gridster-Virtual-Infrastructure-Deployment-icon-link tabframe-Virtual-Infrastructure-Deployment Welcome to VID
@@ -81,7 +81,7 @@ Login To Portal GUI
Click Element xpath=//a[@id='loginBtn']
Wait Until Page Contains Applications ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
Log Logged in to ${PORTAL_ENDPOINT}${PORTAL_ENV}
- Log To Console ${loginId} SUCCESS
+ Log ${loginId} SUCCESS
Logout From Portal GUI
[Documentation] Logs out of Portal GUI
@@ -108,14 +108,14 @@ Run Portal Application Login Test
Click Element xpath=//a[@id='loginBtn']
Wait Until Page Contains Applications ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
Log Logged in to ${PORTAL_ENDPOINT}${PORTAL_ENV}
- Log To Console ${loginId} SUCCESS
+ Log ${loginId} SUCCESS
Sleep 5
Click Element id=${click_element}
Sleep 5
Select Frame id=${tabframe}
Sleep 5
Page Should Contain ${match_string}
- Log To Console Portal Application Access SUCCESS ${click_element}
+ Log Portal Application Access SUCCESS ${click_element}
Go To Portal HOME
[Documentation] Naviage to Portal Home
diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot
index e9291025..6022695f 100644
--- a/robot/resources/so/direct_instantiate.robot
+++ b/robot/resources/so/direct_instantiate.robot
@@ -47,6 +47,6 @@ Instantiate Service Direct To SO
Log ${preload_dict}
Log ${template}
${service_instance_id}= Create Entire Service ${csar_file} ${vnf_template_file} ${template} ${name_suffix} ${GLOBAL_INJECTED_REGION} ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID}
- Log To Console ServiceInstanceId:${service_instance_id}
+ Log ServiceInstanceId:${service_instance_id}
Should Not Be Equal As Strings ${service_instance_id} None
diff --git a/robot/resources/test_templates/closedloop_test_template.robot b/robot/resources/test_templates/closedloop_test_template.robot
index 7354dc1a..4547b92a 100644
--- a/robot/resources/test_templates/closedloop_test_template.robot
+++ b/robot/resources/test_templates/closedloop_test_template.robot
@@ -205,12 +205,12 @@ VFWCL High Test
[Documentation] Test Control Loop for High Traffic
[Arguments] ${pkg_host}
Enable Streams V2 ${pkg_host} 10
- Log To Console Set number of streams to 10
+ Log Set number of streams to 10
:FOR ${i} IN RANGE 12
\ Sleep 15s
\ ${resp}= Get List Of Enabled Streams V2 ${pkg_host}
\ ${stream_count}= Set Variable ${resp['stream-count']['streams']['active-streams']}
- \ Log To Console Number of streams: ${stream_count}
+ \ Log Number of streams: ${stream_count}
\ Exit For Loop If '${stream_count}'=='5'
Should Be Equal As Integers ${stream_count} 5
@@ -218,12 +218,12 @@ VFWCL Low Test
[Documentation] Test Control Loop for Low Traffic
[Arguments] ${pkg_host}
Enable Streams V2 ${pkg_host} 1
- Log To Console Set number of streams to 1
+ Log Set number of streams to 1
:FOR ${i} IN RANGE 12
\ Sleep 15s
\ ${resp}= Get List Of Enabled Streams V2 ${pkg_host}
\ ${stream_count}= Set Variable ${resp['stream-count']['streams']['active-streams']}
- \ Log To Console Number of streams: ${stream_count}
+ \ Log Number of streams: ${stream_count}
\ Exit For Loop If '${stream_count}'=='5'
Should Be Equal As Integers ${stream_count} 5
diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
index 952882d2..3040f02e 100644
--- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
@@ -100,17 +100,17 @@ Orchestrate VNF With CDS
Set To Dictionary ${dict} vnfs=${data}
${request}= Apply Template cds ${so_request_template} ${dict}
- Log To Console --------request--------
- Log to console ${request}
- Log To Console --------end request--------
+ Log --------request--------
+ Log ${request}
+ Log --------end request--------
${resp}= Run MSO Post Request ${so_uri_path} ${request}
- Log To Console --------response-------
+ Log --------response-------
${json_string}= Evaluate json.dumps(${resp.json()}) json
- Log To Console ${json_string}
- Log To Console instanceId=${resp.json()['requestReferences']['instanceId']}
+ Log ${json_string}
+ Log instanceId=${resp.json()['requestReferences']['instanceId']}
${requestId}= Catenate ${resp.json()['requestReferences']['requestId']}
- Log To Console requestId=${requestId}
- Log To Console -------end response-------
+ Log requestId=${requestId}
+ Log -------end response-------
# Poll MSO Get Request ${GLOBAL_MSO_STATUS_PATH}${request_id} COMPLETE
@@ -135,12 +135,12 @@ Get VFModule Info
Create Environment cds ${GLOBAL_TEMPLATE_FOLDER}
:FOR ${key} IN @{keys}
\ ${module}= Get From Dictionary ${vfModules} ${key}
- \ Log to console ${vnf} ${key}
+ \ Log ${vnf} ${key}
\ Run keyword if "${vnf}" in "${key}" set vfmodule param ${key} ${module} ${dict}
\ ${vfmodule_payload}= Apply Template cds ${vfmodule_template_name} ${dict}
\ ${data}= Catenate ${data} ${delim} ${vfmodule_payload}
\ ${delim}= Catenate ,
- Log To Console ${data}
+ Log ${data}
[Return] ${data}
set vfmodule param
diff --git a/robot/testsuites/closed-loop.robot b/robot/testsuites/closed-loop.robot
index c93df15c..2a089cd1 100644
--- a/robot/testsuites/closed-loop.robot
+++ b/robot/testsuites/closed-loop.robot
@@ -20,7 +20,7 @@ VDNS Closed Loop Test
VFWCL Closed Loop Test
[TAGS] vfwclosedloop
- Log To Console ${EMPTY}
+ Log ${EMPTY}
VFWCL High Test ${PACKET_GENERATOR_HOST}
VFWCL Low Test ${PACKET_GENERATOR_HOST}
[Teardown] VFWCL Set To Medium ${PACKET_GENERATOR_HOST}