X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=vimconn_openstack.py;h=e0a3aa31dc0cf4e94d8321515cff887df29fd06f;hb=1f3a67138592443a8bd68ab936e071cb5bccda55;hp=f44257d4660f90f453b5862fbda707ecfb78bcda;hpb=edca7b3cd61081d0d84de9acc4dec39daaa07419;p=osm%2FRO.git diff --git a/vimconn_openstack.py b/vimconn_openstack.py index f44257d4..e0a3aa31 100644 --- a/vimconn_openstack.py +++ b/vimconn_openstack.py @@ -56,7 +56,7 @@ netStatus2manoFormat={'ACTIVE':'ACTIVE','PAUSED':'PAUSED','INACTIVE':'INACTIVE', } class vimconnector(vimconn.vimconnector): - def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None, log_level="DEBUG", config={}): + def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None, log_level=None, config={}): '''using common constructor parameters. In this case 'url' is the keystone authorization url, 'url_admin' is not use @@ -83,6 +83,8 @@ class vimconnector(vimconn.vimconnector): self.n_creds['api_key'] = passwd self.reload_client = True self.logger = logging.getLogger('openmano.vim.openstack') + if log_level: + self.logger.setLevel( getattr(logging, log_level) ) def __setitem__(self,index, value): '''Set individuals parameters @@ -271,7 +273,7 @@ class vimconnector(vimconn.vimconnector): #parts = ip_profile['dhcp_start_address'].split('.') #ip_int = (int(parts[0]) << 24) + (int(parts[1]) << 16) + (int(parts[2]) << 8) + int(parts[3]) ip_int = int(netaddr.IPAddress(ip_profile['dhcp_start_address'])) - ip_int += ip_profile['dhcp_count'] + ip_int += ip_profile['dhcp_count'] - 1 ip_str = str(netaddr.IPAddress(ip_int)) subnet['allocation_pools'][0]['end'] = ip_str #self.logger.debug(">>>>>>>>>>>>>>>>>> Subnet: %s", str(subnet)) @@ -598,7 +600,7 @@ class vimconnector(vimconn.vimconnector): #Then we filter by the rest of filter fields: checksum filtered_list = [] for image in image_list: - image_dict=glance.images.get(image.id) + image_dict=self.glance.images.get(image.id) if image_dict['checksum']==filter_dict.get('checksum'): filtered_list.append(image) return filtered_list