X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tools%2Fodl-mdsal-clustering-tests%2Fclustering-performance-test%2Fflow_config_blaster.py;fp=tools%2Fodl-mdsal-clustering-tests%2Fclustering-performance-test%2Fflow_config_blaster.py;h=09a25dabd915baab654ed1e717e3705ac514c2ef;hb=2054a254a8608303b4f69aa5181285686cab5c6e;hp=62844f7ee62d820d5627a2cf49225f3a25686875;hpb=bbbcc56449574b792ba23f646d152eaca5a3cacd;p=integration%2Ftest.git diff --git a/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster.py index 62844f7ee6..09a25dabd9 100755 --- a/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster.py +++ b/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster.py @@ -64,28 +64,28 @@ class FlowConfigBlaster(object): # The "built-in" flow template flow_mode_template = { - u"flow": [ + "flow": [ { - u"hard-timeout": 65000, - u"idle-timeout": 65000, - u"cookie_mask": 4294967295, - u"flow-name": u"FLOW-NAME-TEMPLATE", - u"priority": 2, - u"strict": False, - u"cookie": 0, - u"table_id": 0, - u"installHw": False, - u"id": u"FLOW-ID-TEMPLATE", - u"match": { - u"ipv4-destination": u"0.0.0.0/32", - u"ethernet-match": {u"ethernet-type": {u"type": 2048}}, + "hard-timeout": 65000, + "idle-timeout": 65000, + "cookie_mask": 4294967295, + "flow-name": "FLOW-NAME-TEMPLATE", + "priority": 2, + "strict": False, + "cookie": 0, + "table_id": 0, + "installHw": False, + "id": "FLOW-ID-TEMPLATE", + "match": { + "ipv4-destination": "0.0.0.0/32", + "ethernet-match": {"ethernet-type": {"type": 2048}}, }, - u"instructions": { - u"instruction": [ + "instructions": { + "instruction": [ { - u"order": 0, - u"apply-actions": { - u"action": [{u"drop-action": {}, u"order": 0}] + "order": 0, + "apply-actions": { + "action": [{"drop-action": {}, "order": 0}] }, } ] @@ -583,12 +583,12 @@ def get_json_from_file(filename): ft = json.load(f) keys = ft["flow"][0].keys() if ( - (u"cookie" in keys) - and (u"flow-name" in keys) - and (u"id" in keys) - and (u"match" in keys) + ("cookie" in keys) + and ("flow-name" in keys) + and ("id" in keys) + and ("match" in keys) ): - if u"ipv4-destination" in ft[u"flow"][0]["match"].keys(): + if "ipv4-destination" in ft["flow"][0]["match"].keys(): print('File "%s" ok to use as flow template' % filename) return ft except ValueError: