- self.identity_api_version = kwargs.get('identity_api_version', 2)
- self.image_api_version = kwargs.get('image_api_version', 2)
- self.network_api_version = kwargs.get('network_api_version', 2)
- self.compute_api_version = kwargs.get('compute_api_version', 2)
+
+ if kwargs.get('identity_api_version') is None:
+ self.identity_api_version = keystone_utils.V2_VERSION_NUM
+ else:
+ self.identity_api_version = float(kwargs['identity_api_version'])
+
+ if kwargs.get('image_api_version') is None:
+ self.image_api_version = glance_utils.VERSION_2
+ else:
+ self.image_api_version = float(kwargs['image_api_version'])
+
+ if kwargs.get('network_api_version') is None:
+ self.network_api_version = 2
+ else:
+ self.network_api_version = float(kwargs['network_api_version'])
+
+ if kwargs.get('compute_api_version') is None:
+ self.compute_api_version = 2
+ else:
+ self.compute_api_version = float(kwargs['compute_api_version'])
+
+ if kwargs.get('heat_api_version') is None:
+ self.heat_api_version = 1
+ else:
+ val = kwargs['heat_api_version']
+ ver = float(val)
+ self.heat_api_version = int(ver)
+
+ if kwargs.get('volume_api_version') is None:
+ self.volume_api_version = cinder_utils.VERSION_2
+ else:
+ self.volume_api_version = float(kwargs['volume_api_version'])
+
+ if kwargs.get('magnum_api_version') is None:
+ self.magnum_api_version = 1
+ else:
+ self.magnum_api_version = float(kwargs['magnum_api_version'])
+