From 02b741cd78f730e84ecc5b8fb4b469f3d0b5c9c4 Mon Sep 17 00:00:00 2001 From: Jose-Santos Pulido Garcia Date: Thu, 2 Jun 2016 16:32:02 +0200 Subject: [PATCH] Rename sfcofl2_demo to sfc-openflow-renderer_demo This patch does not modify code at all. Only paths and a few comments have been modified. Change-Id: I8c6e6d35934e6669d8353d6dc8fc24e2d5038a9c Signed-off-by: Jose-Santos Pulido Garcia --- .../client_tool.py | 6 +++--- .../rest_sender.py | 6 +++--- .../rest_sender/mpls-config/README | 0 .../rest_sender/mpls-config/RestConf-ACLs-HttpPut.json | 0 .../rest_sender/mpls-config/RestConf-RSP-HttpPost.json | 0 .../rest_sender/mpls-config/RestConf-SFCs-HttpPut.json | 0 .../rest_sender/mpls-config/RestConf-SFFs-HttpPut.json | 0 .../rest_sender/mpls-config/RestConf-SFGs-HttpPut.json | 0 .../rest_sender/mpls-config/RestConf-SFPs-HttpPut.json | 0 .../rest_sender/mpls-config/RestConf-SFs-HttpPut.json | 0 .../rest_sender/mpls-config/SampleClassifierRest.json | 0 .../rest_sender/vlan-config/README.txt | 0 .../rest_sender/vlan-config/RestConf-RSP-HttpPost.json | 0 .../rest_sender/vlan-config/RestConf-SFCs-HttpPut.json | 0 .../rest_sender/vlan-config/RestConf-SFFs-HttpPut.json | 0 .../rest_sender/vlan-config/RestConf-SFPs-HttpPut.json | 0 .../rest_sender/vlan-config/RestConf-SFs-HttpPut.json | 0 .../vlan-config/RestConf-SFselect-HttpPut.json | 0 .../set_app_coexistence.sh | 0 .../set_sequential_path_id.sh | 0 .../sfc-openflow-renderer_mininet.py} | 0 .../sfc-openflow-renderer_mininet_README} | 8 ++++---- .../update_rsp_tor.py | 4 ++-- 23 files changed, 12 insertions(+), 12 deletions(-) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/client_tool.py (97%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender.py (98%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/mpls-config/README (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/mpls-config/RestConf-ACLs-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/mpls-config/RestConf-RSP-HttpPost.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/mpls-config/RestConf-SFCs-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/mpls-config/RestConf-SFFs-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/mpls-config/RestConf-SFGs-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/mpls-config/RestConf-SFPs-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/mpls-config/RestConf-SFs-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/mpls-config/SampleClassifierRest.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/vlan-config/README.txt (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/vlan-config/RestConf-RSP-HttpPost.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/vlan-config/RestConf-SFCs-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/vlan-config/RestConf-SFFs-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/vlan-config/RestConf-SFPs-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/vlan-config/RestConf-SFs-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/rest_sender/vlan-config/RestConf-SFselect-HttpPut.json (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/set_app_coexistence.sh (100%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/set_sequential_path_id.sh (100%) rename sfc-test/{sfcofl2_demo/sfcofl2_mininet.py => sfc-openflow-renderer_demo/sfc-openflow-renderer_mininet.py} (100%) rename sfc-test/{sfcofl2_demo/sfcofl2_mininet_README => sfc-openflow-renderer_demo/sfc-openflow-renderer_mininet_README} (74%) rename sfc-test/{sfcofl2_demo => sfc-openflow-renderer_demo}/update_rsp_tor.py (97%) diff --git a/sfc-test/sfcofl2_demo/client_tool.py b/sfc-test/sfc-openflow-renderer_demo/client_tool.py similarity index 97% rename from sfc-test/sfcofl2_demo/client_tool.py rename to sfc-test/sfc-openflow-renderer_demo/client_tool.py index edb3c1afe..6caac35d9 100755 --- a/sfc-test/sfcofl2_demo/client_tool.py +++ b/sfc-test/sfc-openflow-renderer_demo/client_tool.py @@ -8,7 +8,7 @@ __email__ = "brady.allen.johnson@ericsson.com" __status__ = "demo code" # -# This script is intended to only work with sfcofl2_mininet.py +# This script is intended to only work with sfc-openflow-renderer_mininet.py # # This script will do the following for clients: # add a client to RSP mapping in GW1 @@ -265,7 +265,7 @@ def _get_client_mappings(context): client_info.vlan = vlan def _get_gw2_servers(): - # When sfcofl2_mininet.py starts, it stores the output of the mininet "dump" command here: /tmp/mininet_dump.txt + # When sfc-openflow-renderer_mininet.py starts, it stores the output of the mininet "dump" command here: /tmp/mininet_dump.txt # Return a list of all servers # Looking for the following lines: # @@ -284,7 +284,7 @@ def _get_gw2_servers(): return server_list def _get_gw_port(gw_name, conn_name): - # When sfcofl2_mininet.py starts, it stores the output of the mininet "net" command here: /tmp/mininet_net.txt + # When sfc-openflow-renderer_mininet.py starts, it stores the output of the mininet "net" command here: /tmp/mininet_net.txt # Looking for one of the following lines to know the gw switch ports # gw1 lo: gw1-eth1:tor1-eth3 gw1-eth2:gw2-eth2 gw1-eth3:client1-eth0 # gw2 lo: gw2-eth1:tor1-eth4 gw2-eth2:gw1-eth2 gw2-eth3:server1-eth0 gw2-eth4:server2-eth0 diff --git a/sfc-test/sfcofl2_demo/rest_sender.py b/sfc-test/sfc-openflow-renderer_demo/rest_sender.py similarity index 98% rename from sfc-test/sfcofl2_demo/rest_sender.py rename to sfc-test/sfc-openflow-renderer_demo/rest_sender.py index 5c569fd65..9347eb0fc 100755 --- a/sfc-test/sfcofl2_demo/rest_sender.py +++ b/sfc-test/sfc-openflow-renderer_demo/rest_sender.py @@ -215,7 +215,7 @@ def get_cmd_line(context): context.batch_sff = True context.batch_sfp = True context.batch_rsp = True - # For now, ACL is no longer used by SFCOFL2 + # For now, ACL is no longer used by sfc-openflow-renderer #context.batch_acl = True else: context.batch_sf = args.send_sf @@ -333,7 +333,7 @@ def batch(context): send_rest(context, GET, context.rest_url_sfc) send_rest(context, GET, context.rest_url_sfp) send_rest(context, GET, context.rest_url_rsp) - # For now, ACL is no longer used by SFCOFL2 + # For now, ACL is no longer used by sfc-openflow-renderer #send_rest(context, GET, context.rest_url_acl) elif context.batch_nodes: send_rest(context, GET, context.rest_url_nodes) @@ -378,7 +378,7 @@ def CLI(context): send_rest(context, PUT, context.rest_url_sfp, context.rest_path_sfp) time.sleep(1); send_rest(context, POST, context.rest_url_rsp_rpc, context.rest_path_rsp) - # For now, ACL is no longer used by SFCOFL2 + # For now, ACL is no longer used by sfc-openflow-renderer # Need to wait until the SFC creates the RSP internally before sending the ACL #print 'Sleeping 2 seconds while RSP being created' #time.sleep(2); diff --git a/sfc-test/sfcofl2_demo/rest_sender/mpls-config/README b/sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/README similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/mpls-config/README rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/README diff --git a/sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-ACLs-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-ACLs-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-ACLs-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-ACLs-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-RSP-HttpPost.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-RSP-HttpPost.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-RSP-HttpPost.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-RSP-HttpPost.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-SFCs-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-SFCs-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-SFCs-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-SFCs-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-SFFs-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-SFFs-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-SFFs-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-SFFs-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-SFGs-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-SFGs-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-SFGs-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-SFGs-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-SFPs-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-SFPs-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-SFPs-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-SFPs-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-SFs-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-SFs-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/mpls-config/RestConf-SFs-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/RestConf-SFs-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/mpls-config/SampleClassifierRest.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/SampleClassifierRest.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/mpls-config/SampleClassifierRest.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/mpls-config/SampleClassifierRest.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/vlan-config/README.txt b/sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/README.txt similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/vlan-config/README.txt rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/README.txt diff --git a/sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-RSP-HttpPost.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-RSP-HttpPost.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-RSP-HttpPost.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-RSP-HttpPost.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-SFCs-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-SFCs-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-SFCs-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-SFCs-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-SFFs-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-SFFs-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-SFFs-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-SFFs-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-SFPs-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-SFPs-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-SFPs-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-SFPs-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-SFs-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-SFs-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-SFs-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-SFs-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-SFselect-HttpPut.json b/sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-SFselect-HttpPut.json similarity index 100% rename from sfc-test/sfcofl2_demo/rest_sender/vlan-config/RestConf-SFselect-HttpPut.json rename to sfc-test/sfc-openflow-renderer_demo/rest_sender/vlan-config/RestConf-SFselect-HttpPut.json diff --git a/sfc-test/sfcofl2_demo/set_app_coexistence.sh b/sfc-test/sfc-openflow-renderer_demo/set_app_coexistence.sh similarity index 100% rename from sfc-test/sfcofl2_demo/set_app_coexistence.sh rename to sfc-test/sfc-openflow-renderer_demo/set_app_coexistence.sh diff --git a/sfc-test/sfcofl2_demo/set_sequential_path_id.sh b/sfc-test/sfc-openflow-renderer_demo/set_sequential_path_id.sh similarity index 100% rename from sfc-test/sfcofl2_demo/set_sequential_path_id.sh rename to sfc-test/sfc-openflow-renderer_demo/set_sequential_path_id.sh diff --git a/sfc-test/sfcofl2_demo/sfcofl2_mininet.py b/sfc-test/sfc-openflow-renderer_demo/sfc-openflow-renderer_mininet.py similarity index 100% rename from sfc-test/sfcofl2_demo/sfcofl2_mininet.py rename to sfc-test/sfc-openflow-renderer_demo/sfc-openflow-renderer_mininet.py diff --git a/sfc-test/sfcofl2_demo/sfcofl2_mininet_README b/sfc-test/sfc-openflow-renderer_demo/sfc-openflow-renderer_mininet_README similarity index 74% rename from sfc-test/sfcofl2_demo/sfcofl2_mininet_README rename to sfc-test/sfc-openflow-renderer_demo/sfc-openflow-renderer_mininet_README index 664cb9a71..43063bc70 100644 --- a/sfc-test/sfcofl2_demo/sfcofl2_mininet_README +++ b/sfc-test/sfc-openflow-renderer_demo/sfc-openflow-renderer_mininet_README @@ -2,8 +2,8 @@ Test MPLS: - Run ODL controller - Run mininet: - cd path/to/sfc/sfc-test/sfcofl2 - sudo python sfcofl2_mininet.py -I $CONTROLLER_IP -L --demo-mode mpls + cd path/to/sfc/sfc-test/sfc-openflow-renderer_demo + sudo python sfc-openflow-renderer_mininet.py -I $CONTROLLER_IP -L --demo-mode mpls - Config ODL and send flows: python rest_sender.py --prefix path/to/mpls-config -Check flows @@ -16,8 +16,8 @@ Test VLAN: - Run ODL controller - Run mininet: - cd path/to/sfc/sfc-test/sfcofl2 - sudo python sfcofl2_mininet.py -I $CONTROLLER_IP -L --demo-mode vlan + cd path/to/sfc/sfc-test/sfc-openflow-renderer_demo + sudo python sfc-openflow-renderer_mininet.py -I $CONTROLLER_IP -L --demo-mode vlan - Config ODL and send flows: python rest_sender.py --prefix path/to/vlan-config -Check flows diff --git a/sfc-test/sfcofl2_demo/update_rsp_tor.py b/sfc-test/sfc-openflow-renderer_demo/update_rsp_tor.py similarity index 97% rename from sfc-test/sfcofl2_demo/update_rsp_tor.py rename to sfc-test/sfc-openflow-renderer_demo/update_rsp_tor.py index 67ba3a237..06582c1d4 100755 --- a/sfc-test/sfcofl2_demo/update_rsp_tor.py +++ b/sfc-test/sfc-openflow-renderer_demo/update_rsp_tor.py @@ -8,7 +8,7 @@ __email__ = "brady.allen.johnson@ericsson.com" __status__ = "demo code" # -# This script is intended to only work with sfcofl2_mininet.py +# This script is intended to only work with sfc-openflow-renderer_mininet.py # # This script will read the SFF flows and populate the ToR switch accordingly # It will look for these sorts of flows, and populate the ToR with the necessary info: @@ -134,7 +134,7 @@ def get_gw_egress_vlans(gw_name): return gw_vlan_list def get_tor_port(sff_name): - # When sfcofl2_mininet.py starts, it stores the output of the mininet "net" command here: /tmp/mininet_net.txt + # When sfc-openflow-renderer_mininet.py starts, it stores the output of the mininet "net" command here: /tmp/mininet_net.txt # Looking for the following line to know the tor1 switch ports # tor1 lo: tor1-eth1:sff1-eth2 tor1-eth2:sff2-eth2 tor1-eth3:gw1-eth1 tor1-eth4:gw2-eth1 -- 2.36.6