Merge branch 'luismartingarcia-master'

datacenter · Apr 1, 2015 · 27294f8 · 27294f8
2 parents 5f8012c + db08ca5
commit 27294f8
Show file tree

Hide file tree

Showing 29 changed files with 895 additions and 893 deletions.
diff --git a/acitoolkit/acicounters.py b/acitoolkit/acicounters.py
@@ -16,8 +16,6 @@
 """ACI Toolkit module for counter and stats objects
 """
 
-from acibaseobject import BaseACIObject, BaseRelation
-
 import json
 import logging
 import re
@@ -148,7 +146,7 @@ def _get_path(self, dn):
                                 result[countName][granularity][period][attrName] = float(counterAttr[attrName])
 
                         else:
-                            print 'Found unsupported counter', countName, granularity, period
+                            print('Found unsupported counter ' + str(countName) + " " + str(granularity) + " " + str(period))
 
                         result[countName][granularity][period]['intervalEnd'] = counterAttr.get('repIntvEnd')
                         result[countName][granularity][period]['intervalStart'] = counterAttr.get('repIntvStart')
@@ -497,7 +495,7 @@ def _process_data(data) :
                             for attrName in ['dropBytesRate', 'dropBytesRateAvg', 'dropBytesRateMax', 'dropBytesRateMin']:
                                 result[countName][granularity][period][attrName] = float(counterAttr[attrName])
                         else:
-                            print 'Found unsupported counter', countName, granularity, period
+                            print('Found unsupported counter ' + str(countName) + " " + str(granularity) + " " + str(period))
                         result[countName][granularity][period]['intervalEnd'] = counterAttr.get('repIntvEnd')
                         result[countName][granularity][period]['intervalStart'] = counterAttr.get('repIntvStart')