FIXES: Correct issues revealed in BD Lab deployment

[it/test.git] / ric_robot_suite / robot / resources / appmgr / appmgr_interface.robot

diff --git a/ric_robot_suite/robot/resources/appmgr/appmgr_interface.robot b/ric_robot_suite/robot/resources/appmgr/appmgr_interface.robot
index 3f14604..a66ee2d 100644 (file)
--- a/ric_robot_suite/robot/resources/appmgr/appmgr_interface.robot
+++ b/ric_robot_suite/robot/resources/appmgr/appmgr_interface.robot
@@ -5,6 +5,8 @@ Library        RequestsLibrary
 
 Resource       ../global_properties.robot
 
+Resource       ../ric/ric_utils.robot
+
 *** Variables ***
 ${APPMGR_BASE_PATH}  /ric/v1/xapps
 ${APPMGR_ENDPOINT}   ${GLOBAL_APPMGR_SERVER_PROTOCOL}://${GLOBAL_INJECTED_APPMGR_IP_ADDR}:${GLOBAL_APPMGR_SERVER_PORT}
@@ -51,9 +53,10 @@ Deploy XApp
 Deploy XApps
      [Documentation]  Create one or more XApps
      [Arguments]      @{xapp_names}
-     :FOR             ${xapp}  IN             @{xapp_names}
-     \                Deploy XApp   ${xapp}
-
+     FOR             ${xapp}  IN             @{xapp_names}
+                     Deploy XApp   ${xapp}
+     END
+     
 Undeploy XApp
      [Documentation]  Remove a deployed XApp
      [Arguments]      ${xapp_name}
@@ -64,8 +67,8 @@ Undeploy XApp
 Undeploy XApps
      [Documentation]  Remove one or more deployed XApps
      [Arguments]      @{xapp_names}
-     :FOR             ${xapp}  IN     @{xapp_names}
-     \                Undeploy XApp   ${xapp}
+     FOR             ${xapp}  IN     @{xapp_names}
+                     Undeploy XApp   ${xapp}
 
 Deploy All Available XApps
      [Documentation]  Attempt to deploy any not-currently-deployed XApp
@@ -104,20 +107,3 @@ Run AppMgr DELETE Request
      ${headers} =     Create Dictionary  Accept=application/json         Content-Type=application/json
      ${resp} =        Delete Request     roboAppmgrDelete                ${APPMGR_BASE_PATH}${path}  headers=${headers}
      [Return]         ${resp}
-
-
-# a few useful list routines that should probably live elsewhere
-Pluck
-     [Documentation]  Get the values of a specific key from a list of dictionaries
-     [Arguments]      ${k}      ${l}
-     @{names} =       Evaluate  filter(lambda v: v != None, [i.get('${k}', None) for i in ${l}])
-     [Return]         ${names}
-
-Subtract From List
-     [Documentation]  Remove the elements of the second argument from the first
-     [Arguments]      ${x}  ${y}
-     ${diff} =        Run Keyword If  ${y}
-     ...              Evaluate  filter(lambda v: v not in ${y}, ${x})
-     ...              ELSE
-     ...              Set Variable    ${x}
-     [Return]         ${diff}