From fad224664e854c28a2d6665e8e0b6ae59b8e4051 Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Sat, 25 Jun 2022 18:19:04 +0200
Subject: [PATCH] Refactor packages_lib into package_lib

Change-Id: I5cd6944813eaec749e66fa44ce4c5e707563d11b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 robot-systest/lib/package_lib.robot           | 34 +++++++++++--
 robot-systest/lib/packages_lib.robot          | 48 -------------------
 .../testsuite/basic_12-ns_primitives.robot    |  2 +-
 3 files changed, 30 insertions(+), 54 deletions(-)
 delete mode 100644 robot-systest/lib/packages_lib.robot

diff --git a/robot-systest/lib/package_lib.robot b/robot-systest/lib/package_lib.robot
index dd6be27..e797a6f 100644
--- a/robot-systest/lib/package_lib.robot
+++ b/robot-systest/lib/package_lib.robot
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ##
-# Copyright 2019 Tech Mahindra Limited
+# Copyright ETSI Contributors and Others.
 #
 # All Rights Reserved.
 #
@@ -18,12 +18,9 @@
 # under the License.
 ##
 
-## Change log:
-# 1. Feature 7829: Jayant Madavi, Mrityunjay Yadav : MY00514913@techmahindra.com : 06-sep-2019
-##
-
 *** Settings ***
 Library   String
+Library   OperatingSystem
 
 
 *** Variables ***
@@ -53,3 +50,30 @@ Delete Package
 
     # Proceedes with the onboarding with the appropriate arguments
     ${rc}   ${stdout}=   Run and Return RC and Output   rm ${pkg}.tar.gz
+
+
+Package Build
+    [Documentation]   Build the package NS, VNF given the package_folder
+
+    [Arguments]   ${pkg_folder}   ${skip_charm_build}=${EMPTY}
+
+    ${skip_charm}   Set Variable If   '${skip_charm_build}'!='${EMPTY}'   --skip-charm-build   \
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm package-build ${pkg_folder} ${skip_charm}
+    Should Be Equal As Integers   ${rc}   ${success_return_code}
+    Should Contain   ${stdout}   Package created
+    ${package}=   Get Line   ${stdout}   -1
+
+    [Return]   ${package}
+
+
+Package Validate
+    [Documentation]   Validate descriptors given a base directory
+
+    [Arguments]   ${pkg_folder}
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm package-validate ${pkg_folder} | awk -F\| '$2 !~ /-/ && $4 ~ /OK|ERROR/ {print $4}'
+    Should Be Equal As Integers   ${rc}   ${success_return_code}
+    Should Contain   ${stdout}   'OK'
+    ${package}=   Get Line   ${stdout}   -1
+
+    [Return]   ${package}
+
diff --git a/robot-systest/lib/packages_lib.robot b/robot-systest/lib/packages_lib.robot
deleted file mode 100644
index 9111544..0000000
--- a/robot-systest/lib/packages_lib.robot
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020 Canonical Ltd.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-*** Settings ***
-Library   String
-Library   OperatingSystem
-
-
-*** Variables ***
-${success_return_code}   0
-
-
-*** Keywords ***
-Package Build
-    [Documentation]   Build the package NS, VNF given the package_folder
-
-    [Arguments]   ${pkg_folder}   ${skip_charm_build}=${EMPTY}
-
-    ${skip_charm}   Set Variable If   '${skip_charm_build}'!='${EMPTY}'   --skip-charm-build   \
-    ${rc}   ${stdout}=   Run and Return RC and Output   osm package-build ${pkg_folder} ${skip_charm}
-    Should Be Equal As Integers   ${rc}   ${success_return_code}
-    Should Contain   ${stdout}   Package created
-    ${package}=   Get Line   ${stdout}   -1
-
-    [Return]   ${package}
-
-Package Validate
-    [Documentation]   Validate descriptors given a base directory
-
-    [Arguments]   ${pkg_folder}
-    ${rc}   ${stdout}=   Run and Return RC and Output   osm package-validate ${pkg_folder} | awk -F\| '$2 !~ /-/ && $4 ~ /OK|ERROR/ {print $4}'
-    Should Be Equal As Integers   ${rc}   ${success_return_code}
-    Should Contain   ${stdout}   'OK'
-    ${package}=   Get Line   ${stdout}   -1
-
-    [Return]   ${package}
-
diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot
index 84a9128..3355691 100644
--- a/robot-systest/testsuite/basic_12-ns_primitives.robot
+++ b/robot-systest/testsuite/basic_12-ns_primitives.robot
@@ -22,7 +22,7 @@ Library   Process
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/packages_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/package_lib.robot
 
 Force Tags   basic_12   cluster_ee_config   daily   regression
 
-- 
2.17.1