# HG changeset patch # User Ian Campbell <[email protected]> # Date 1278584144 -3600 # Node ID fdb69254017b8de14ae7b9e068e54a800ffbfe49 # Parent 0c034eadb88871b92ffd1e6a1412229d6a5050f2 CA-39903: accept openvswitch in /etc/xensource/network.conf
The OpenVswitch project is trying to standardise on using OpenVswitch rather than simply vswitch so accept both in network.conf and report the mode as openvswitch. Signed-off-by: Ian Campbell <[email protected]> diff -r 0c034eadb888 -r fdb69254017b ocaml/netdev/netdev.ml --- a/ocaml/netdev/netdev.ml Thu Jul 08 11:14:32 2010 +0100 +++ b/ocaml/netdev/netdev.ml Thu Jul 08 11:15:44 2010 +0100 @@ -39,11 +39,12 @@ let string_of_kind kind = match kind with | Bridge -> "bridge" - | Vswitch -> "vswitch" + | Vswitch -> "openvswitch" let kind_of_string s = match s with | "bridge" -> Bridge | "vswitch" -> Vswitch + | "openvswitch" -> Vswitch | _ -> raise (Unknown_network_backend s) module Internal = struct ocaml/netdev/netdev.ml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
# HG changeset patch # User Ian Campbell <[email protected]> # Date 1278584144 -3600 # Node ID fdb69254017b8de14ae7b9e068e54a800ffbfe49 # Parent 0c034eadb88871b92ffd1e6a1412229d6a5050f2 CA-39903: accept openvswitch in /etc/xensource/network.conf The OpenVswitch project is trying to standardise on using OpenVswitch rather than simply vswitch so accept both in network.conf and report the mode as openvswitch. Signed-off-by: Ian Campbell <[email protected]> diff -r 0c034eadb888 -r fdb69254017b ocaml/netdev/netdev.ml --- a/ocaml/netdev/netdev.ml Thu Jul 08 11:14:32 2010 +0100 +++ b/ocaml/netdev/netdev.ml Thu Jul 08 11:15:44 2010 +0100 @@ -39,11 +39,12 @@ let string_of_kind kind = match kind with | Bridge -> "bridge" - | Vswitch -> "vswitch" + | Vswitch -> "openvswitch" let kind_of_string s = match s with | "bridge" -> Bridge | "vswitch" -> Vswitch + | "openvswitch" -> Vswitch | _ -> raise (Unknown_network_backend s) module Internal = struct
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
