X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=RO-VIM-openstack%2Fosm_rovim_openstack%2Fvimconn_openstack.py;h=bd3955ace7054bdd7017c0bcee32a13d86fac364;hb=e493e9b91720e5116e00b4c06cf66c767bccce2f;hp=acc5ba8ab00e24229f5bf3b0abd2a4eeb99d3cb2;hpb=7a1f525e6e76418766f5aed3874ec7f54333091f;p=osm%2FRO.git diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py index acc5ba8a..bd3955ac 100644 --- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py +++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py @@ -152,7 +152,7 @@ class vimconnector(vimconn.VimConnector): logging.getLogger('urllib3').setLevel(logging.WARNING) logging.getLogger('keystoneauth').setLevel(logging.WARNING) logging.getLogger('novaclient').setLevel(logging.WARNING) - self.logger = logging.getLogger('openmano.vim.openstack') + self.logger = logging.getLogger('ro.vim.openstack') # allow security_groups to be a list or a single string if isinstance(self.config.get('security_groups'), str): @@ -161,7 +161,7 @@ class vimconnector(vimconn.VimConnector): # ###### VIO Specific Changes ######### if self.vim_type == "VIO": - self.logger = logging.getLogger('openmano.vim.vio') + self.logger = logging.getLogger('ro.vim.vio') if log_level: self.logger.setLevel(getattr(logging, log_level)) @@ -1225,6 +1225,7 @@ class vimconnector(vimconn.VimConnector): type: 'virtual', 'PCI-PASSTHROUGH'('PF'), 'SR-IOV'('VF'), 'VFnotShared' vim_id: filled/added by this function floating_ip: True/False (or it can be None) + port_security: True/False 'cloud_config': (optional) dictionary with: 'key-pairs': (optional) list of strings with the public key to be inserted to the default user 'users': (optional) list of users to be inserted, each item is a dict with: @@ -1706,7 +1707,8 @@ class vimconnector(vimconn.VimConnector): else: vm['status'] = "OTHER" vm['error_msg'] = "VIM status reported " + vm_vim['status'] - + vm_vim.pop("OS-EXT-SRV-ATTR:user_data", None) + vm_vim.pop("user_data", None) vm['vim_info'] = self.serialize(vm_vim) vm["interfaces"] = []