From 34aa9a8c6153e9d0ccf757f91783077cc257556e Mon Sep 17 00:00:00 2001 From: Dileep Ranganathan Date: Fri, 7 Sep 2018 07:47:52 -0700 Subject: [PATCH] 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 --- conductor/conductor/common/music/api.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 = {} -- 2.16.6