localization changes. Removed vsa params from volume cloud API. Alex changes

5 files changed, 17 insertions, 35 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 786ceaccc..e31b755de 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -730,26 +730,12 @@ class CloudController(object):
             snapshot_id = None
             LOG.audit(_("Create volume of %s GB"), size, context=context)
 
-        to_vsa_id = kwargs.get('to_vsa_id', None)
-        if to_vsa_id:
-            to_vsa_id = ec2utils.ec2_id_to_id(to_vsa_id)
-
-        from_vsa_id = kwargs.get('from_vsa_id', None)
-        if from_vsa_id:
-            from_vsa_id = ec2utils.ec2_id_to_id(from_vsa_id)
-
-        if to_vsa_id or from_vsa_id:
-            LOG.audit(_("Create volume of %s GB associated with VSA "\
-                        "(to: %d, from: %d)"),
-                        size, to_vsa_id, from_vsa_id, context=context)
-
         volume = self.volume_api.create(
                 context,
                 size=size,
                 snapshot_id=snapshot_id,
                 name=kwargs.get('display_name'),
-                description=kwargs.get('display_description'),
-                to_vsa_id=to_vsa_id, from_vsa_id=from_vsa_id)
+                description=kwargs.get('display_description'))
         # TODO(vish): Instance should be None at db layer instead of
         #             trying to lazy load, but for now we turn it into
         #             a dict to avoid an error.
@@ -864,8 +850,7 @@ class CloudController(object):
 
     def describe_vsas(self, context, vsa_id=None, status=None,
                       availability_zone=None, **kwargs):
-#        LOG.debug(_("vsa_id=%s, status=%s, az=%s"),
-#                    (vsa_id, status, availability_zone))
+        LOG.audit(_("Describe VSAs"))
         result = []
         vsas = []
         if vsa_id is not None:
diff --git a/nova/scheduler/vsa.py b/nova/scheduler/vsa.py
index 4277c0ba8..260545746 100644
--- a/nova/scheduler/vsa.py
+++ b/nova/scheduler/vsa.py
@@ -96,8 +96,8 @@ class VsaScheduler(simple.SimpleScheduler):
                cap['cmp_func'] is not None and \
                cap['cmp_func'](qos_values[cap['cap1']],
                                drive_type[cap['cap2']]):
-                # LOG.debug(_("One of required capabilities found: %s:%s"),
-                #            cap['cap1'], drive_type[cap['cap2']])
+                # LOG.debug(("One of required capabilities found: %s:%s"),
+                #           cap['cap1'], drive_type[cap['cap2']])
                 pass
             else:
                 return False
@@ -416,8 +416,8 @@ class VsaScheduler(simple.SimpleScheduler):
         drive_type = dict(drive_type)
 
         # otherwise - drive type is loaded
-        LOG.debug(_("Spawning volume %d with drive type %s"),
-                    volume_ref['id'], drive_type)
+        LOG.debug(_("Spawning volume %(volume_id)s with drive type "\
+                    "%(drive_type)s"), locals())
 
         LOG.debug(_("Service states BEFORE %s"),
                     self.zone_manager.service_states)
diff --git a/nova/vsa/api.py b/nova/vsa/api.py
index 853816477..7ce643aab 100644
--- a/nova/vsa/api.py
+++ b/nova/vsa/api.py
@@ -275,15 +275,18 @@ class API(base.Base):
                           " Setting to default"), vc_count)
             vc_count = FLAGS.max_vcs_in_vsa
 
+        vsa_name = vsa['name']
         old_vc_count = vsa['vc_count']
         if vc_count > old_vc_count:
-            LOG.debug(_("Adding %d VCs to VSA %s."),
-                        (vc_count - old_vc_count, vsa['name']))
+            add_cnt = vc_count - old_vc_count
+            LOG.debug(_("Adding %(add_cnt)d VCs to VSA %(vsa_name)s."),
+                        locals())
             # VP-TODO: actual code for adding new VCs
 
         elif vc_count < old_vc_count:
-            LOG.debug(_("Deleting %d VCs from VSA %s."),
-                        (old_vc_count - vc_count, vsa['name']))
+            del_cnt = old_vc_count - vc_count
+            LOG.debug(_("Deleting %(add_cnt)d VCs from VSA %(vsa_name)s."),
+                        locals())
             # VP-TODO: actual code for deleting extra VCs
 
     def _force_volume_delete(self, ctxt, volume):
diff --git a/nova/vsa/drive_types.py b/nova/vsa/drive_types.py
index b8cb66b22..781206cdf 100644
--- a/nova/vsa/drive_types.py
+++ b/nova/vsa/drive_types.py
@@ -23,14 +23,6 @@ from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import quota
-from nova import rpc
-from nova.db import base
-
-from nova import compute
-from nova import volume
-from nova.compute import instance_types
-
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string('drive_type_template_short', '%s_%sGB_%sRPM',
diff --git a/nova/vsa/manager.py b/nova/vsa/manager.py
index a9a9fa2e8..c67358672 100644
--- a/nova/vsa/manager.py
+++ b/nova/vsa/manager.py
@@ -101,8 +101,10 @@ class VsaManager(manager.SchedulerDependentManager):
             return
 
         if len(volumes) != vsa['vol_count']:
-            LOG.debug(_("VSA ID %d: Not all volumes are created (%d of %d)"),
-                        vsa_id, len(volumes), vsa['vol_count'])
+            cvol_real = len(volumes)
+            cvol_exp = vsa['vol_count']
+            LOG.debug(_("VSA ID %(vsa_id)d: Not all volumes are created "\
+                        "(%(cvol_real)d of %(cvol_exp)d)"), locals())
             return
 
         # all volumes created (successfully or not)