From: Dileep Ranganathan <dileep.ranganathan@intel.com>
Date: Fri, 7 Sep 2018 14:47:52 +0000 (-0700)
Subject: Revert the authorization header
X-Git-Tag: 1.2.2~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F31%2F65331%2F1;p=optf%2Fhas.git

Revert the authorization header

Reverting the authorization header to support older version of MUSIC.

Change-Id: Ia3a653559fd1838d530e8dfd4576b1da3502ca22
Issue-ID: OPTFRA-259
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
---

diff --git a/conductor/conductor/common/music/api.py b/conductor/conductor/common/music/api.py
index 2eeab3d..2517b8c 100644
--- a/conductor/conductor/common/music/api.py
+++ b/conductor/conductor/common/music/api.py
@@ -129,12 +129,18 @@ class MusicAPI(object):
         self.rest = rest.REST(**kwargs)
 
         if(CONF.music_api.music_new_version):
+            MUSIC_version = CONF.music_api.music_version.split(".")
+
             self.rest.session.headers['content-type'] = 'application/json'
+            self.rest.session.headers['X-patchVersion'] = MUSIC_version[2]
             self.rest.session.headers['ns'] = CONF.music_api.aafns
-            auth_str = 'Basic {}'.format(base64.encodestring(
-                '{}:{}'.format(CONF.music_api.aafuser,
-                               CONF.music_api.aafpass)).strip())
-            self.rest.session.headers['Authorization'] = auth_str
+            # auth_str = 'Basic {}'.format(base64.encodestring(
+            #     '{}:{}'.format(CONF.music_api.aafuser,
+            #                    CONF.music_api.aafpass)).strip())
+            # self.rest.session.headers['Authorization'] = auth_str
+
+            self.rest.session.headers['userId'] = CONF.music_api.aafuser
+            self.rest.session.headers['password'] = CONF.music_api.aafpass
 
         self.lock_ids = {}