Skip to content

CP-15358: support external ip address setting #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robhoes merged 2 commits into from
Mar 3, 2016
Merged

CP-15358: support external ip address setting #112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b65a284
CP-15358: support external ip address setting
Mar 1, 2016
0b301a4
xenops: extend Vif.t with defaults when needed
robhoes Feb 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 41 additions & 4 deletions xen/xenops_interface.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ module Network = struct
| Local of string (** name of a local switch *)
| Remote of string * string (** vm.id * switch *)
type ts = t list

let default_t = Local "xenbr0"
end

module Pci = struct
Expand Down Expand Up @@ -434,16 +436,30 @@ module Vif = struct

type id = string * string

type ipv4_configuration =
| Unspecified4
| Static4 of string list * string option (* a list of CIDRs and optionally a gateway *)

let default_ipv4_configuration = Unspecified4

type ipv6_configuration =
| Unspecified6
| Static6 of string list * string option (* a list of CIDRs and optionally a gateway *)

let default_ipv6_configuration = Unspecified6

type locked_addresses = {
ipv4: string list;
ipv6: string list;
ipv4: string list;
ipv6: string list;
}

type locking_mode =
| Unlocked (* all traffic permitted *)
type locking_mode =
| Unlocked (* all traffic permitted *)
| Disabled (* no traffic permitted *)
| Locked of locked_addresses

let default_locking_mode = Unlocked

type t = {
id: id;
position: int;
Expand All @@ -455,8 +471,27 @@ module Vif = struct
other_config: (string * string) list;
locking_mode: locking_mode;
extra_private_keys: (string * string) list;
ipv4_configuration: ipv4_configuration;
ipv6_configuration: ipv6_configuration;
}

let default_t = {
id = "", "";
position = 0;
mac = "fe:ff:ff:ff:ff:ff";
carrier = true;
mtu = 1500;
rate = None;
backend = Network.default_t;
other_config = [];
locking_mode = default_locking_mode;
extra_private_keys = [];
ipv4_configuration = default_ipv4_configuration;
ipv6_configuration = default_ipv6_configuration;
}

let t_of_rpc rpc = Rpc.struct_extend rpc (rpc_of_t default_t) |> t_of_rpc

type state = {
active: bool;
plugged: bool;
Expand Down Expand Up @@ -651,6 +686,8 @@ module VIF = struct
external remove: debug_info -> Vif.id -> unit = ""
external set_carrier: debug_info -> Vif.id -> bool -> Task.id = ""
external set_locking_mode: debug_info -> Vif.id -> Vif.locking_mode -> Task.id = ""
external set_ipv4_configuration: debug_info -> Vif.id -> Vif.ipv4_configuration -> Task.id = ""
external set_ipv6_configuration: debug_info -> Vif.id -> Vif.ipv6_configuration -> Task.id = ""
end

module VGPU = struct
Expand Down