commit 97a0f63ff267141f15e05d9a1d31e7050cbd2393
author macauley <macauleycheng@gmail.com> Fri Aug 07 17:03:39 2015 +0800
committer macauley <macauleycheng@gmail.com> Fri Aug 07 17:03:39 2015 +0800
tree cc6327e7772c15e0eeed5658b5fa87d6e14f1c40
parent 25999cf9e03809b040d2cc11453a35fbe54c8cb8

update code

application_example/virtualRouter.py

diff --git a/application_example/virtualRouter.py b/application_example/virtualRouter.py
index 166b67f..2feee2b 100755
--- a/application_example/virtualRouter.py
+++ b/application_example/virtualRouter.py
@@ -13,7 +13,7 @@
 NW1_ACCESS_LPORT=0x10001
 NW2_ACCESS_LPORT=0x10002        
 NW1_NEWORK_LPORT=0x10003
-NW2_NEWORK_LPORT=0x10004        
+NW2_NEWORK_LPORT=0x10003        
 
 NW1_VRF=1
 NW2_VRF=2
@@ -173,7 +173,6 @@
         logging.info("config VTEP 0x%lx, VNID=%lu, SRC_IP %s, DST_IP %s, NEXTHOP_ID %d", NW2_NEWORK_LPORT, NW2_VNID, SWITCH_IP, VXLAN_TNL_H1_IP_STR, VXLAN_TNL_H_R_NHP_ID);
         assert(send_edit_config(config["switch_ip"], vtep_conf_xml) == True)
         
-        
         """add routing flow"""    
         #add port table to have vxlan ability
         add_port_table_flow(self.controller)
@@ -366,13 +365,15 @@
         logging.info("delete config VTEP 0x%lx, VNID=%lu, SRC_IP %s, DST_IP %s, NEXTHOP_ID %d", NW1_NEWORK_LPORT, NW1_VNID, SWITCH_IP, VXLAN_TNL_H1_IP_STR, VXLAN_TNL_H_R_NHP_ID);
         assert(send_edit_config(config["switch_ip"], vtep_conf_xml) == True)
 
-        vtep_conf_xml=get_vtep_lport_config_xml(dp_id=feature_reply.datapath_id, 
-                                                lport=NW2_NEWORK_LPORT, 
-                                                src_ip=SWITCH_IP_STR, dst_ip=VXLAN_TNL_H1_IP_STR,
-                                                next_hop_id=VXLAN_TNL_H_R_NHP_ID, 
-                                                vnid=NW2_VNID, operation="delete")												
-        logging.info("delete config VTEP 0x%lx, VNID=%lu, SRC_IP %s, DST_IP %s, NEXTHOP_ID %d", NW2_NEWORK_LPORT, NW2_VNID, SWITCH_IP, VXLAN_TNL_H1_IP_STR, VXLAN_TNL_H_R_NHP_ID);
-        assert(send_edit_config(config["switch_ip"], vtep_conf_xml) == True)
+        if NW1_NEWORK_LPORT != NW2_NEWORK_LPORT:
+            vtep_conf_xml=get_vtep_lport_config_xml(dp_id=feature_reply.datapath_id, 
+                                                    lport=NW2_NEWORK_LPORT, 
+                                                    src_ip=SWITCH_IP_STR, dst_ip=VXLAN_TNL_H1_IP_STR,
+                                                    next_hop_id=VXLAN_TNL_H_R_NHP_ID, 
+                                                    vnid=NW2_VNID, operation="delete")												
+            logging.info("delete config VTEP 0x%lx, VNID=%lu, SRC_IP %s, DST_IP %s, NEXTHOP_ID %d", NW2_NEWORK_LPORT, NW2_VNID, SWITCH_IP, VXLAN_TNL_H1_IP_STR, VXLAN_TNL_H_R_NHP_ID);
+            assert(send_edit_config(config["switch_ip"], vtep_conf_xml) == True)
+
         #delete next hop and network port for H1
         next_hop_conf_xml=get_next_hop_config_xml(next_hop_id=VXLAN_TNL_H_R_NHP_ID, 
 		                                          dst_mac=VXLAN_TNL_H_R_MAC_STR,