Skip to content
Jump to bottom

Update main.py. Should work for python 3 and 2 #5

Merged
merged 1 commit into from
May 21, 2019
+8 −8
Merged

Update main.py. Should work for python 3 and 2 #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def addNewFlowRoute(self, flowRouteData=None):
my_router = None
for router in self.routers:

for name, value in router.iteritems():
for name, value in router.items():
if 'rr' in value['type']:
my_router = [value['ip']]

Expand Down Expand Up @@ -99,7 +99,7 @@ def modFlowRoute(self, flowRouteData=None):
my_router = None
for router in self.routers:

for name, value in router.iteritems():
for name, value in router.items():
if 'rr' in value['type']:
my_router = [value['ip']]

Expand Down Expand Up @@ -130,7 +130,7 @@ def delFlowRoute(self, flowRouteData=None):
my_router = None
for router in self.routers:

for name, value in router.iteritems():
for name, value in router.items():
if 'rr' in value['type']:
my_router = [value['ip']]

Expand Down Expand Up @@ -163,7 +163,7 @@ def getActiveFlowRoutes(self):

for router in self.routers:

for name, value in router.iteritems():
for name, value in router.items():

with Device(host=value['ip'], user=self.dev_user, password=self.dev_pw) as dev:

Expand Down Expand Up @@ -204,7 +204,7 @@ def getActiveFlowRoutes(self):
_item = item.split('=')
destination[index] = _item[1] if len(_item) > 1 else _item[0]

hash_object = hashlib.sha512(b'{0}{1}'.format(str(destination), str(value['ip'])))
hash_object = hashlib.sha512('{0}{1}'.format(str(destination), str(value['ip'])).encode('utf-8'))
hex_dig = hash_object.hexdigest()
_age = dict()

Expand Down Expand Up @@ -305,7 +305,7 @@ def getActiveFlowRouteFilter(self):

for router in self.routers:

for name, value in router.iteritems():
for name, value in router.items():
self.filter_active[name] = list()

with Device(host=value['ip'], user=self.dev_user, password=self.dev_pw) as dev:
Expand Down Expand Up @@ -347,7 +347,7 @@ def loadFlowRouteConfig(self):

for router in self.routers:

for name, value in router.iteritems():
for name, value in router.items():

if 'rr' in value['type']:
dev_ip.append(value['ip'])
Expand Down Expand Up @@ -447,7 +447,7 @@ def loadFlowRouteConfig(self):
for route in _data['route']:
_action = dict()

for key, value in route['then'].iteritems():
for key, value in route['then'].items():

if value[0]:
_action[key] = {'value': value}
Expand Down