refacotr out headers so they are common across ecomp

Issue-ID: TEST-173
Change-Id: I55e5e4e6cc5e2a684858e94a485debc2b21d283d
Signed-off-by: DR695H <dr695h@att.com>

1 files changed, 3 insertions, 16 deletions

diff --git a/robotframework-onap/ONAPLibrary/MUSICKeywords.py b/robotframework-onap/ONAPLibrary/MUSICKeywords.py
index abceb54..6d1ae6e 100644
--- a/robotframework-onap/ONAPLibrary/MUSICKeywords.py
+++ b/robotframework-onap/ONAPLibrary/MUSICKeywords.py
@@ -16,7 +16,7 @@ from robot.api import logger
 from robot.api.deco import keyword
 from robot.libraries.BuiltIn import BuiltIn
 
-from ONAPLibrary.Utilities import Utilities
+from ONAPLibrary.RequestsHelper import RequestsHelper
 
 
 class MUSICKeywords(object):
@@ -25,8 +25,7 @@ class MUSICKeywords(object):
 
     def __init__(self):
         super(MUSICKeywords, self).__init__()
-        self.application_id = "robot-ete"
-        self.uuid = Utilities()
+        self.reqs = RequestsHelper()
         self.builtin = BuiltIn()
 
     @keyword
@@ -39,21 +38,10 @@ class MUSICKeywords(object):
         """Runs an MUSIC get request"""
         logger.info("Creating session" + endpoint)
         RequestsLibrary().create_session("music", endpoint, auth=auth)
-        resp = RequestsLibrary().get_request("music", data_path, headers=self.create_headers(accept))
+        resp = RequestsLibrary().get_request("music", data_path, headers=self.reqs.create_headers(accept=accept))
         logger.info("Received response from music " + resp.text)
         return resp
 
-    def create_headers(self, accept="application/json"):
-        """Create the headers that are used by MUSIC"""
-        uuid = self.uuid.generate_uuid4()
-        headers = {
-            "Accept": accept,
-            "Content-Type": "application/json",
-            "X-TransactionId": self.application_id + "-" + uuid,
-            "X-FromAppId": self.application_id
-        }
-        return headers
-
     def run_health_check(self, endpoint, health_check_path):
         """Runs MUSIC Health check"""
         resp = self.run_get_request(endpoint, health_check_path)
@@ -65,4 +53,3 @@ class MUSICKeywords(object):
         resp = self.run_get_request(endpoint, health_check_path)
         self.builtin.should_be_equal_as_strings(resp.status_code, "200")
         self.builtin.should_be_equal_as_strings(resp.json()['Cassandra'], "Active")
-