X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Ftools%2FRobot_Tool%2Flibraries%2FForwardingRuleManager.py;h=b80fb14cfa083746977945d69a3428e434e12a23;hb=072f6e3a8d1bdf8f4c663843589c22d93ba07791;hp=c03a6e781ba3da5d0fb9c3a5c1ba814b0a2681fe;hpb=9b1ebec4fff0e4e3d67f67d46cd9e390408f6cd0;p=integration%2Ftest.git diff --git a/test/tools/Robot_Tool/libraries/ForwardingRuleManager.py b/test/tools/Robot_Tool/libraries/ForwardingRuleManager.py index c03a6e781b..b80fb14cfa 100644 --- a/test/tools/Robot_Tool/libraries/ForwardingRuleManager.py +++ b/test/tools/Robot_Tool/libraries/ForwardingRuleManager.py @@ -7,7 +7,7 @@ Updated: 2013-11-05 import sys sys.path.append('..') -from restlib import * +from restlib import * # noqa from testmodule import TestModule sys.path.remove('..') @@ -16,7 +16,8 @@ sys.path.remove('..') class ForwardingRuleManager(TestModule): """ Test for the forwarding rule manager. - Start 2-layer tree topology network. e.g., in Mininet, run 'sudo mn --controller=remote,ip=127.0.0.1 --mac --topo tree,2' + Start 2-layer tree topology network. e.g., in Mininet, run + 'sudo mn --controller=remote,ip=127.0.0.1 --mac --topo tree,2' """ def __init__(self, restSubContext='/controller/nb/v2/flowprogrammer', user=DEFAULT_USER, password=DEFAULT_PWD, @@ -32,31 +33,35 @@ class ForwardingRuleManager(TestModule): def add_flow_to_node(self, node_type, node_id, name, body): suffix = 'node/' + node_type + '/' + node_id + '/staticFlow' - r = super(self.__class__, self).add_entry(suffix, name, body) + super(self.__class__, self).add_entry(suffix, name, body) def remove_flow_from_node(self, node_type, node_id, name): suffix = 'node/' + node_type + '/' + node_id + '/staticFlow' - r = super(self.__class__, self).remove_entry(suffix, name) + super(self.__class__, self).remove_entry(suffix, name) def test_flow_operations(self, node_type, node_id, name, body): """ Test the add,remove,show actions on flows. - >>> body = {'installInHw':'true','name':'flow1','node':{'id':'00:00:00:00:00:00:00:02','type':'OF'},'priority':'1','etherType':'0x800','nwDst':'10.0.0.1/32','actions':['OUTPUT=1']} + >>> body = {'installInHw':'true','name':'flow1','node': + {'id':'00:00:00:00:00:00:00:02','type':'OF'}, + 'priority':'1','etherType':'0x800','nwDst':'10.0.0.1/32','actions':['OUTPUT=1']} >>> ForwardingRuleManager().test_flow_operations('OF','00:00:00:00:00:00:00:02','flow1',body) True - >>> body = {'installInHw':'true','name':'flow2','node':{'id':'00:00:00:00:00:00:00:02','type':'OF'},'priority':'1','etherType':'0x800','nwDst':'10.0.0.2/32','actions':['OUTPUT=2']} + >>> body = {'installInHw':'true','name':'flow2','node': + {'id':'00:00:00:00:00:00:00:02','type':'OF'}, + 'priority':'1','etherType':'0x800','nwDst':'10.0.0.2/32','actions':['OUTPUT=2']} >>> ForwardingRuleManager().test_flow_operations('OF','00:00:00:00:00:00:00:02','flow2',body) True """ result = [] - #current flow table should be empty. + # current flow table should be empty. r = self.get_flows() result.append(body not in r['flowConfig']) - #Add a flow + # Add a flow self.add_flow_to_node(node_type, node_id, name, body) r = self.get_flows() result.append(body in r['flowConfig']) - #Remove the flow and test if succeed + # Remove the flow and test if succeed if result == [True, True]: self.remove_flow_from_node(node_type, node_id, name) r = self.get_flows()