From 43f202b7cc12255c1a5afbe8ac810ffbf97396f5 Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Wed, 23 Mar 2011 14:27:40 -0400 Subject: [PATCH] Fix slice tag roles In MyPLC 5.0, slice tag roles are now strings ('admin') instead of numbers (10). Changed the numbers to the equivalent string values. --- sfa/managers/vini/vini_network.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sfa/managers/vini/vini_network.py b/sfa/managers/vini/vini_network.py index 26d8a338..fcade6c4 100644 --- a/sfa/managers/vini/vini_network.py +++ b/sfa/managers/vini/vini_network.py @@ -160,13 +160,13 @@ class ViniSlice(Slice): key = self.network.free_egre_key() except: raise InvalidRSpec("ran out of EGRE keys!") - tag = self.update_tag('egre_key', key, None, 10) + tag = self.update_tag('egre_key', key, None, 'admin') return def turn_on_netns(self): tag = self.get_tag('netns') if (not tag) or (tag.value != '1'): - tag = self.update_tag('netns', '1', None, 10) + tag = self.update_tag('netns', '1', None, 'admin') return def turn_off_netns(self): @@ -185,9 +185,9 @@ class ViniSlice(Slice): break else: newcaps = "CAP_NET_ADMIN," + tag.value - self.update_tag('capabilities', newcaps, None, 10) + self.update_tag('capabilities', newcaps, None, 'admin') else: - tag = self.add_tag('capabilities', 'CAP_NET_ADMIN', None, 10) + tag = self.add_tag('capabilities', 'CAP_NET_ADMIN', None, 'admin') return def remove_cap_net_admin(self): @@ -200,7 +200,7 @@ class ViniSlice(Slice): newcaps.append(cap) if newcaps: value = ','.join(newcaps) - self.update_tag('capabilities', value, None, 10) + self.update_tag('capabilities', value, None, 'admin') else: tag.delete() return @@ -371,7 +371,7 @@ class ViniNetwork(Network): def updateSliceTags(self): slice = self.slice - tag = slice.update_tag('vini_topo', 'manual', None, 10) + tag = slice.update_tag('vini_topo', 'manual', None, 'admin') slice.assign_egre_key() slice.turn_on_netns() slice.add_cap_net_admin() @@ -382,7 +382,7 @@ class ViniNetwork(Network): linkdesc.append(node.get_topo_rspec(link)) if linkdesc: topo_str = "%s" % linkdesc - tag = slice.update_tag('topo_rspec', topo_str, node, 10) + tag = slice.update_tag('topo_rspec', topo_str, node, 'admin') # Expire the un-updated topo_rspec tags for tag in self.getSliceTags(): -- 2.43.0