apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix typos in xenserver scripts to setup OVS tunnel network

Browse Source
This commit is contained in:
Murali Reddy 2014-04-07 17:17:33 +05:30
parent 2530bf9658
commit cc2892c782
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
View File

@ -506,7 +506,7 @@ def configure_ovs_bridge_for_routing_policies(bridge, json_config):
# add a default rule in ingress table drop packets # add a default rule in ingress table drop packets
add_flow(bridge, priority=0, table=5, actions='drop') add_flow(bridge, priority=0, table=5, actions='drop')
return "SUCCESS: successfully configured bridge as per the later routing policies of the VPC" return "SUCCESS: successfully configured bridge as per the latest routing policies of the VPC"
except: except:
logging.debug("An unexpected error occurred while configuring bridge as per VPC's routing policies.") logging.debug("An unexpected error occurred while configuring bridge as per VPC's routing policies.")

2
scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
View File

@ -131,7 +131,7 @@ def main(command, vif_raw):
apply_flows(bridge, this_vif_ofport, vif_ofports) apply_flows(bridge, this_vif_ofport, vif_ofports)
# handle case where brdige is setup for VPC and VPC is enabled for distributed routing # handle case where bridge is setup for VPC which is enabled for distributed routing
if ovs_vpc_distributed_vr_network == 'True': if ovs_vpc_distributed_vr_network == 'True':
vlan = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'br-to-vlan', bridge]) vlan = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'br-to-vlan', bridge])
if vlan != '0': if vlan != '0':

18
scripts/vm/hypervisor/xenserver/ovstunnel
View File

@ -103,8 +103,6 @@ def setup_ovs_bridge(session, args):
"bridge=%s" % bridge, "--minimal"]) "bridge=%s" % bridge, "--minimal"])
lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid, lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
"other-config:is-ovs-tun-network=True"]) "other-config:is-ovs-tun-network=True"])
lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
"other-config:is-ovs_vpc_distributed_vr_network=False"])
conf_hosts = lib.do_cmd([lib.XE_PATH, "network-param-get", conf_hosts = lib.do_cmd([lib.XE_PATH, "network-param-get",
"uuid=%s" % xs_nw_uuid, "uuid=%s" % xs_nw_uuid,
"param-name=other-config", "param-name=other-config",
@ -157,8 +155,6 @@ def setup_ovs_bridge_for_distributed_routing(session, args):
# been configured # been configured
xs_nw_uuid = lib.do_cmd([lib.XE_PATH, "network-list", xs_nw_uuid = lib.do_cmd([lib.XE_PATH, "network-list",
"bridge=%s" % bridge, "--minimal"]) "bridge=%s" % bridge, "--minimal"])
lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
"other-config:is-ovs-tun-network=False"])
lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid, lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
"other-config:is-ovs-vpc-distributed-vr-network=True"]) "other-config:is-ovs-vpc-distributed-vr-network=True"])
conf_hosts = lib.do_cmd([lib.XE_PATH, "network-param-get", conf_hosts = lib.do_cmd([lib.XE_PATH, "network-param-get",
@ -295,14 +291,24 @@ def create_tunnel(session, args):
# find xs network for this bridge, verify is used for ovs tunnel network # find xs network for this bridge, verify is used for ovs tunnel network
xs_nw_uuid = lib.do_cmd([lib.XE_PATH, "network-list", xs_nw_uuid = lib.do_cmd([lib.XE_PATH, "network-list",
"bridge=%s" % bridge, "--minimal"]) "bridge=%s" % bridge, "--minimal"])
ovs_tunnel_network = lib.do_cmd([lib.XE_PATH,"network-param-get", ovs_tunnel_network = False
try:
ovs_tunnel_network = lib.do_cmd([lib.XE_PATH,"network-param-get",
"uuid=%s" % xs_nw_uuid, "uuid=%s" % xs_nw_uuid,
"param-name=other-config", "param-name=other-config",
"param-key=is-ovs-tun-network", "--minimal"]) "param-key=is-ovs-tun-network", "--minimal"])
ovs_vpc_distributed_vr_network = lib.do_cmd([lib.XE_PATH,"network-param-get", except:
pass
ovs_vpc_distributed_vr_network = False
try:
ovs_vpc_distributed_vr_network = lib.do_cmd([lib.XE_PATH,"network-param-get",
"uuid=%s" % xs_nw_uuid, "uuid=%s" % xs_nw_uuid,
"param-name=other-config", "param-name=other-config",
"param-key=is-ovs-vpc-distributed-vr-network", "--minimal"]) "param-key=is-ovs-vpc-distributed-vr-network", "--minimal"])
except:
pass
if ovs_tunnel_network == 'True': if ovs_tunnel_network == 'True':
# add flow entryies for dropping broadcast coming in from gre tunnel # add flow entryies for dropping broadcast coming in from gre tunnel
lib.add_flow(bridge, priority=1000, in_port=tun_ofport, lib.add_flow(bridge, priority=1000, in_port=tun_ofport,