cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject git commit: updated refs/heads/4.4 to c312078
Date Mon, 07 Apr 2014 11:58:14 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 83c13ce1b -> c312078aa


fix typos in xenserver scripts to setup OVS tunnel network


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c312078a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c312078a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c312078a

Branch: refs/heads/4.4
Commit: c312078aac4c2bcb446b63c3dfafe7ab236a65d8
Parents: 83c13ce
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Mon Apr 7 17:17:33 2014 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
Committed: Mon Apr 7 17:27:55 2014 +0530

----------------------------------------------------------------------
 .../hypervisor/xenserver/cloudstack_pluginlib.py  |  2 +-
 scripts/vm/hypervisor/xenserver/ovs-vif-flows.py  |  2 +-
 scripts/vm/hypervisor/xenserver/ovstunnel         | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c312078a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
index 50a1fa2..85daa86 100644
--- a/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
+++ b/scripts/vm/hypervisor/xenserver/cloudstack_pluginlib.py
@@ -506,7 +506,7 @@ def configure_ovs_bridge_for_routing_policies(bridge, json_config):
             # add a default rule in ingress table drop packets
             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:
         logging.debug("An unexpected error occurred while configuring bridge as per VPC's
routing policies.")

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c312078a/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py b/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
index 2a2f3bd..b2fe11c 100644
--- a/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
+++ b/scripts/vm/hypervisor/xenserver/ovs-vif-flows.py
@@ -131,7 +131,7 @@ def main(command, vif_raw):
             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':
         vlan = pluginlib.do_cmd([pluginlib.VSCTL_PATH, 'br-to-vlan', bridge])
         if vlan != '0':

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c312078a/scripts/vm/hypervisor/xenserver/ovstunnel
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel b/scripts/vm/hypervisor/xenserver/ovstunnel
index 3e17360..f967302 100755
--- a/scripts/vm/hypervisor/xenserver/ovstunnel
+++ b/scripts/vm/hypervisor/xenserver/ovstunnel
@@ -103,8 +103,6 @@ def setup_ovs_bridge(session, args):
                                 "bridge=%s" % bridge, "--minimal"])
         lib.do_cmd([lib.XE_PATH, "network-param-set", "uuid=%s" % xs_nw_uuid,
                    "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",
                                 "uuid=%s" % xs_nw_uuid,
                                 "param-name=other-config",
@@ -158,8 +156,6 @@ def setup_ovs_bridge_for_distributed_routing(session, args):
         xs_nw_uuid = lib.do_cmd([lib.XE_PATH, "network-list",
                                 "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,
                    "other-config:is-ovs-vpc-distributed-vr-network=True"])
         conf_hosts = lib.do_cmd([lib.XE_PATH, "network-param-get",
                                 "uuid=%s" % xs_nw_uuid,
@@ -295,14 +291,24 @@ def create_tunnel(session, args):
         # find xs network for this bridge, verify is used for ovs tunnel network
         xs_nw_uuid = lib.do_cmd([lib.XE_PATH, "network-list",
 								   "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,
 						       "param-name=other-config",
 						       "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,
                            "param-name=other-config",
                            "param-key=is-ovs-vpc-distributed-vr-network", "--minimal"])
+        except:
+            pass
+
         if ovs_tunnel_network == 'True':
             # add flow entryies for dropping broadcast coming in from gre tunnel
             lib.add_flow(bridge, priority=1000, in_port=tun_ofport,


Mime
View raw message