mirror of https://github.com/apache/cloudstack.git
a243339faa
CLOUDSTACK-9266: Make deleting static routes in private gw workThe to-be-deleted static routes were removed from the json file, instead of putting them there with revoke=true. The script that parses the json now doesn't find it and thus does not delete it.
Example after adding/removing some:
```
root@r-3-VM:/var/cache/cloud# cat /etc/cloudstack/staticroutes.json
{
"1.2.3.0/24": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.2.3.0/24",
"revoke": true
},
"1.2.3.4/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.2.3.4/32",
"revoke": true
},
"1.2.33.3/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.2.33.3/32",
"revoke": true
},
"1.22.2.2/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "1.22.2.2/32",
"revoke": true
},
"10.1.2.1/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "10.1.2.1/32",
"revoke": true
},
"10.1.200.0/25": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "10.1.200.0/25",
"revoke": true
},
"10.11.12.13/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "10.11.12.13/32",
"revoke": true
},
"172.16.1.3/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "172.16.1.3/32",
"revoke": true
},
"172.16.15.14/32": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "172.16.15.14/32",
"revoke": false
},
"172.16.17.0/25": {
"gateway": "172.16.0.1",
"ip_address": "172.16.0.2",
"network": "172.16.17.0/25",
"revoke": false
},
"id": "staticroutes"
}
```
This results in:
```
root@r-3-VM:/var/cache/cloud# ip route show
default via 192.168.23.1 dev eth1
169.254.0.0/16 dev eth0 proto kernel scope link src 169.254.1.67
172.16.0.0/24 dev eth2 proto kernel scope link src 172.16.0.2
172.16.15.14 via 172.16.0.1 dev eth2
172.16.17.0/25 via 172.16.0.1 dev eth2
192.168.23.0/24 dev eth1 proto kernel scope link src 192.168.23.4
```
Two static routes left, the rest deleted:
```
172.16.15.14 via 172.16.0.1 dev eth2
172.16.17.0/25 via 172.16.0.1 dev eth2
```
That also matches the UI:
<img width="1327" alt="screen shot 2016-01-30 at 06 34 06" src="https://cloud.githubusercontent.com/assets/1630096/12693933/83e67d80-c71b-11e5-9241-9f478522b7a4.png">
* pr/1386:
CLOUDSTACK-9266: Make deleting static routes in private gw work
Signed-off-by: Remi Bergsma <github@remi.nl>
|
||
|---|---|---|
| .. | ||
| cs | ||
| baremetal-vr.py | ||
| baremetal_snat.sh | ||
| bumpup_priority.sh | ||
| checkbatchs2svpn.sh | ||
| checkrouter.sh | ||
| checks2svpn.sh | ||
| cloud-nic.sh | ||
| configure.py | ||
| cs_cmdline.py | ||
| cs_dhcp.py | ||
| cs_firewallrules.py | ||
| cs_forwardingrules.py | ||
| cs_guestnetwork.py | ||
| cs_ip.py | ||
| cs_loadbalancer.py | ||
| cs_monitorservice.py | ||
| cs_network_acl.py | ||
| cs_remoteaccessvpn.py | ||
| cs_site2sitevpn.py | ||
| cs_staticroutes.py | ||
| cs_vmdata.py | ||
| cs_vmp.py | ||
| cs_vpnusers.py | ||
| dnsmasq.sh | ||
| edithosts.sh | ||
| get_template_version.sh | ||
| ilb.sh | ||
| ipassoc.sh | ||
| ipsectunnel.sh | ||
| line_edit.py | ||
| loadbalancer.sh | ||
| master.py | ||
| merge.py | ||
| monitor_service.sh | ||
| netusage.sh | ||
| passwd_server | ||
| passwd_server_ip | ||
| passwd_server_ip.py | ||
| patchsystemvm.sh | ||
| prepare_pxe.sh | ||
| savepassword.sh | ||
| set_redundant.py | ||
| test.sh | ||
| update_config.py | ||
| vmdata.py | ||
| vpc_func.sh | ||
| vpc_netusage.sh | ||
| vpc_passwd_server | ||
| vpc_snat.sh | ||
| vpc_staticroute.sh | ||
| vr_cfg.sh | ||
