Merge "Use pycassa xget() instead of get()"

Juniper · Mar 17, 2016 · d64f893 · d64f893
2 parents 578840b + 8de9c9a
commit d64f893
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/config/common/tests/test_utils.py b/src/config/common/tests/test_utils.py
@@ -254,7 +254,7 @@ def remove(self, key, columns=None):
     # end remove
 
     def xget(self, key, column_start=None, column_finish=None,
-             include_timestamp=False, include_ttl=False):
+             column_count=0, include_timestamp=False, include_ttl=False):
         col_names = []
         if key in self._rows:
             col_names = self._rows[key].keys()

diff --git a/src/config/common/vnc_cassandra.py b/src/config/common/vnc_cassandra.py
@@ -934,7 +934,7 @@ def filter_rows_object_list():
             else: # grab all resources of this type
                 obj_fq_name_cf = self._obj_fq_name_cf
                 try:
-                    cols = obj_fq_name_cf.get('%s' %(obj_type),
+                    cols = obj_fq_name_cf.xget('%s' %(obj_type),
                         column_count=self._MAX_COL)
                 except pycassa.NotFoundException:
                     if count:
@@ -944,7 +944,7 @@ def filter_rows_object_list():
 
                 def filter_rows_no_anchor():
                     all_obj_infos = {}
-                    for col_name, col_val in cols.items():
+                    for col_name, _ in cols:
                         # give chance for zk heartbeat/ping
                         gevent.sleep(0)
                         col_name_arr = utils.decode_string(col_name).split(':')
@@ -1223,5 +1223,3 @@ def _read_back_ref(self, result, obj_uuid, back_ref_type,
 
         result['%s_back_refs' % (back_ref_type)].append(back_ref_info)
     # end _read_back_ref
-
-