From b39d49e8bca3cc758a4f9a60cca10d175490f387 Mon Sep 17 00:00:00 2001 From: tierno Date: Wed, 2 Aug 2017 14:02:15 +0200 Subject: [PATCH] (bug 327) fix vimconn_openstack image creation Change-Id: Icf3acfd8a78ddbcc8b939e1133415b5658c59721 Signed-off-by: tierno --- openmanod | 2 +- osm_ro/vimconn_openstack.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/openmanod b/openmanod index d73edd5e..6190a1ec 100755 --- a/openmanod +++ b/openmanod @@ -48,7 +48,7 @@ import osm_ro __author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ = "$26-aug-2014 11:09:29$" -__version__ = "0.5.18-r527" +__version__ = "0.5.19-r528" version_date = "Aug 2017" database_version = 22 # expected database schema version diff --git a/osm_ro/vimconn_openstack.py b/osm_ro/vimconn_openstack.py index 452d5759..0305c059 100644 --- a/osm_ro/vimconn_openstack.py +++ b/osm_ro/vimconn_openstack.py @@ -89,6 +89,7 @@ class vimconnector(vimconn.vimconnector): self.neutron = self.session.get('neutron') self.cinder = self.session.get('cinder') self.glance = self.session.get('glance') + self.glancev1 = self.session.get('glancev1') self.keystone = self.session.get('keystone') self.api_version3 = self.session.get('api_version3') @@ -152,6 +153,7 @@ class vimconnector(vimconn.vimconnector): self.neutron = self.session['neutron'] = neClient.Client('2.0', session=sess) self.cinder = self.session['cinder'] = cClient.Client(2, session=sess) self.glance = self.session['glance'] = glClient.Client(2, session=sess) + self.glancev1 = self.session['glancev1'] = glClient.Client('1', session=sess) self.session['reload_client'] = False self.persistent_info['session'] = self.session @@ -564,9 +566,6 @@ class vimconnector(vimconn.vimconnector): metadata: metadata of the image Returns the image_id ''' - # ALF TODO: revise and change for the new method or session - #using version 1 of glance client - glancev1 = gl1Client.Client('1',self.glance_endpoint, token=self.keystone.auth_token, **self.k_creds) #TODO check k_creds vs n_creds retry=0 max_retries=3 while retry