Bug 1320430

Description of problem:
Create some pods in different project, try to merge the network of the projects.
Do oadm pod-network join-projects --to pro1 pro2
or oadm pod-network make-projects-global pro2

The pods in project pro2 will loss network connection.


Version-Release number of selected component (if applicable):
openshift v3.2.0.6
kubernetes v1.2.0-36-g4a3f9c5


How reproducible:
always

Steps to Reproduce:
1. Setup multi node env with multi-tenant network 
2. Create some pods in different projects
3. Try to merge the network of the projects

Actual results:
The pods in the projects which has been modified will loss network connection.

Expected results:
The existing pods should have the correct function after modify network.


Additional info:
Check the openflow on the node, the pods' rules are removed and did not getting re-created.

Rules for pod with ip 10.129.0.4 in project3 disappeared after merged to project1
Rules for pod with ip 10.129.0.5 in project4 disappeared after make project4 global 

Though the new rules should be re-generated after the project network modified.

# ovs-ofctl dump-flows br0 -O openflow13 | grep "table=6\|table=7"
 cookie=0x0, duration=1560.735s, table=6, n_packets=2, n_bytes=84, priority=100,arp,arp_tpa=10.129.0.2 actions=output:41
 cookie=0x0, duration=1560.523s, table=6, n_packets=3, n_bytes=126, priority=100,arp,arp_tpa=10.129.0.3 actions=output:42
 cookie=0x0, duration=77043.018s, table=6, n_packets=84, n_bytes=3528, priority=0 actions=output:3
 cookie=0x0, duration=1560.732s, table=7, n_packets=0, n_bytes=0, priority=100,ip,reg0=0,nw_dst=10.129.0.2 actions=output:41
 cookie=0x0, duration=1560.730s, table=7, n_packets=0, n_bytes=0, priority=100,ip,reg0=0xd,nw_dst=10.129.0.2 actions=output:41
 cookie=0x0, duration=1560.521s, table=7, n_packets=0, n_bytes=0, priority=100,ip,reg0=0,nw_dst=10.129.0.3 actions=output:42
 cookie=0x0, duration=1560.519s, table=7, n_packets=8, n_bytes=679, priority=100,ip,reg0=0xc,nw_dst=10.129.0.3 actions=output:42
 cookie=0x0, duration=77043.016s, table=7, n_packets=86, n_bytes=6412, priority=0 actions=output:3