xapi-project · mseri · Mar 23, 2018 · Jan 9, 2018 · Jan 9, 2018 · Jan 10, 2018
diff --git a/ocaml/database/db_interface.ml b/ocaml/database/db_interface.ml
@@ -12,9 +12,7 @@
  * GNU Lesser General Public License for more details.
  *)
 
-type response =
-  | String of string
-  | Bigbuf of Xapi_stdext_bigbuffer.Bigbuffer.t
+type response = string
 
 (** A generic RPC interface *)
 module type RPC = sig

diff --git a/ocaml/database/db_remote_cache_access_v1.ml b/ocaml/database/db_remote_cache_access_v1.ml
@@ -124,6 +124,6 @@ let handler req bio _ =
   let body = Http_svr.read_body ~limit:Db_globs.http_limit_max_rpc_size req bio in
   let body_xml = Xml.parse_string body in
   let reply_xml = DBCacheRemoteListener.process_xmlrpc body_xml in
-  let response = Xml.to_bigbuffer reply_xml in
-  Http_svr.response_fct req fd (Xapi_stdext_bigbuffer.Bigbuffer.length response)
-    (fun fd -> Xapi_stdext_bigbuffer.Bigbuffer.to_fct response (fun s -> ignore(Unix.write fd s 0 (String.length s))))
+  let response = Xml.to_string reply_xml in
+  Http_svr.response_fct req fd (Int64.of_int @@ String.length response)
+    (fun fd -> Unix.write fd response 0 (String.length response) |> ignore)
diff --git a/ocaml/database/db_rpc_client_v1.ml b/ocaml/database/db_rpc_client_v1.ml
@@ -49,9 +49,8 @@ module Make = functor(RPC: Db_interface.RPC) -> struct
   let do_remote_call marshall_args unmarshall_resp fn_name args =
     let xml = marshall_args args in
     let xml = XMLRPC.To.array [XMLRPC.To.string fn_name; XMLRPC.To.string "" (* unused *); xml] in
-    let resp = match RPC.rpc (Xml.to_string xml) with
-      | Db_interface.String s -> Xml.parse_string s
-      | Db_interface.Bigbuf b -> Xml.parse_bigbuffer b
+    let resp = 
+      RPC.rpc (Xml.to_string xml) |> Xml.parse_string
     in
     match XMLRPC.From.array (fun x->x) resp with
       [status_xml; resp_xml] ->

diff --git a/ocaml/database/db_rpc_client_v2.ml b/ocaml/database/db_rpc_client_v2.ml
@@ -20,9 +20,7 @@ open Db_exn
 module Make = functor(RPC: Db_interface.RPC) -> struct
   let initialise = RPC.initialise
   let rpc x =
-    match RPC.rpc (Jsonrpc.to_string x) with
-    | Db_interface.String s -> Jsonrpc.of_string s
-    | Db_interface.Bigbuf b -> raise (Failure "Response too large - cannot convert bigbuffer to json!")
+    RPC.rpc (Jsonrpc.to_string x) |> Jsonrpc.of_string
 
   let process (x: Request.t) =
     let y : Response.t = Response.t_of_rpc (rpc (Request.rpc_of_t x)) in

diff --git a/ocaml/database/db_rpc_common_v2.ml b/ocaml/database/db_rpc_common_v2.ml
@@ -25,7 +25,6 @@ module Request = struct
     | Read_field_where of Db_cache_types.where_record
     | Db_get_by_uuid of string * string
     | Db_get_by_name_label of string * string
-    | Read_set_ref of Db_cache_types.where_record
     | Create_row of string * (string * string) list * string
     | Delete_row of string * string
     | Write_field of string * string * string * string
@@ -57,7 +56,6 @@ module Response = struct
     | Read_field_where of string list
     | Db_get_by_uuid of string
     | Db_get_by_name_label of string list
-    | Read_set_ref of string list
     | Create_row of unit
     | Delete_row of unit
     | Write_field of unit

diff --git a/ocaml/database/jbuild b/ocaml/database/jbuild
@@ -47,7 +47,6 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
    http-svr
    gzip
    uuid
-   xapi-stdext-bigbuffer
    xapi-stdext-encodings
    xapi-stdext-monadic
    xapi-stdext-pervasives
@@ -74,6 +73,15 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
  )
 )
 
+(executable 
+ ((name db_cache_test)
+  (modules (db_cache_test))
+  (libraries (
+    oUnit
+    xapi-database
+  ))
+))
+
 (executable
  ((name unit_test_marshall)
   (modules (
@@ -130,4 +138,12 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
  )
 )
 
+(alias
+ ((name runtest)
+  (deps (db_cache_test.exe))
+  (package xapi-database)
+  (action (run ${<}))
+ )
+)
+
 |} (flags rewriters) coverage_rewriter
diff --git a/ocaml/database/master_connection.ml b/ocaml/database/master_connection.ml
@@ -156,7 +156,7 @@ exception Content_length_required
 let do_db_xml_rpc_persistent_with_reopen ~host ~path (req: string) : Db_interface.response =
   let time_call_started = Unix.gettimeofday() in
   let write_ok = ref false in
-  let result = ref (Db_interface.String "") in
+  let result = ref "" in
   let surpress_no_timeout_logs = ref false in
   let backoff_delay = ref 2.0 in (* initial delay = 2s *)
   let update_backoff_delay () =
@@ -185,19 +185,12 @@ let do_db_xml_rpc_persistent_with_reopen ~host ~path (req: string) : Db_interfac
           with_timestamp (fun () ->
               with_http request (fun (response, _) ->
                   (* XML responses must have a content-length because we cannot use the Xml.parse_in
-                     				   in_channel function: the input channel will buffer an arbitrary amount of stuff
-                     				   and we'll be out of sync with the next request. *)
+                     in_channel function: the input channel will buffer an arbitrary amount of stuff
+                     and we'll be out of sync with the next request. *)
                   let res = match response.Http.Response.content_length with
                     | None -> raise Content_length_required
-                    | Some l -> begin
-                        let open Xapi_stdext_unix in
-                        if (Int64.to_int l) <= Sys.max_string_length then
-                          Db_interface.String (Unixext.really_read_string fd (Int64.to_int l))
-                        else
-                          let buf = Xapi_stdext_bigbuffer.Bigbuffer.make () in
-                          Unixext.really_read_bigbuffer fd buf l;
-                          Db_interface.Bigbuf buf
-                      end
+                    | Some l ->
+                      Xapi_stdext_unix.Unixext.really_read_string fd (Int64.to_int l)
                   in
                   write_ok := true;
                   result := res (* yippeee! return and exit from while loop *)

diff --git a/ocaml/graph/graph.ml b/ocaml/graph/graph.ml
@@ -22,11 +22,11 @@ let refs_of_record cls record =
   let fields = Datamodel_utils.fields_of_obj obj in
   let rec refs_of ty xml = match ty with
     | Ref _ -> [ XMLRPC.From.string xml ]
-    | Set t -> List.concat (API.Legacy.From.set (refs_of t) xml)
-    | Map(k, v) ->
-      let pairs = API.Legacy.From.map (fun x -> x) (refs_of v) xml in
+    | Set t -> List.concat (XMLRPC.From.array (refs_of t) xml)
+    | Map(kt, vt) ->
+      let pairs = List.map (fun (k, v) -> k, refs_of vt v) (XMLRPC.From.structure xml) in
       let vs = List.concat (List.map snd pairs) in
-      begin match k with
+      begin match kt with
         | Ref _ -> List.map fst pairs @ vs
         | _ -> vs
       end
@@ -48,8 +48,8 @@ let name_label_of_record cls record =
 let all_classes = List.map (fun x -> x.name)
     (Dm_api.objects_of_api Datamodel.all_api)
 
-open XMLRPC
 let do_rpc rpc name args =
+  let open XMLRPC in
   match From.methodResponse(rpc(To.methodCall name args)) with
   | Fault _ -> invalid_arg "Fault"
   | Failure(code, strings) -> raise (Api_errors.Server_error(code, strings))
@@ -60,8 +60,8 @@ let do_rpc rpc name args =
 
 let get_all rpc session_id cls =
   let name = Printf.sprintf "%s.get_all_records_where" cls in
-  let args = [ To.string (Ref.string_of session_id); To.string "true" ] in
-  API.Legacy.From.map (fun x -> x) (fun x -> x) (do_rpc rpc name args)
+  let args = [ XMLRPC.To.string (Ref.string_of session_id); XMLRPC.To.string "true" ] in
+  XMLRPC.From.structure (do_rpc rpc name args)
 
 type node = { id: string; label: string; cls: string }
 type edge = { a: string; b: string }

diff --git a/ocaml/idl/datamodel.ml b/ocaml/idl/datamodel.ml
@@ -1183,6 +1183,9 @@ module PIF = struct
                   field ~lifecycle:[Published, rel_creedence, ""] ~qualifier:DynamicRO ~ty:(Map(String, String)) ~default_value:(Some (VMap [])) "properties" "Additional configuration properties for the interface.";
                   field ~lifecycle:[Published, rel_dundee, ""] ~qualifier:DynamicRO ~ty:(Set(String)) ~default_value:(Some (VSet [])) "capabilities" "Additional capabilities on the interface.";
                   field ~lifecycle:[Published, rel_inverness, ""] ~qualifier:DynamicRO ~ty:igmp_status ~default_value:(Some (VEnum "unknown")) "igmp_snooping_status" "The IGMP snooping status of the corresponding network bridge";
+                  field ~in_oss_since:None ~ty:(Set (Ref _network_sriov)) ~in_product_since:rel_kolkata ~qualifier:DynamicRO "sriov_physical_PIF_of" "Indicates which network_sriov this interface is physical of";
+                  field ~in_oss_since:None ~ty:(Set (Ref _network_sriov)) ~in_product_since:rel_kolkata ~qualifier:DynamicRO "sriov_logical_PIF_of" "Indicates which network_sriov this interface is logical of";
+                  field ~qualifier:DynamicRO ~ty:(Ref _pci) ~lifecycle:[Published, rel_kolkata, ""] ~default_value:(Some (VRef null_ref)) "PCI" "Link to underlying PCI device";
                 ]
       ()
 end
@@ -1643,6 +1646,7 @@ module VIF = struct
            field ~ty:ipv6_configuration_mode ~in_product_since:rel_dundee ~qualifier:DynamicRO "ipv6_configuration_mode" "Determines whether IPv6 addresses are configured on the VIF" ~default_value:(Some (VEnum "None"));
            field ~ty:(Set (String)) ~in_product_since:rel_dundee ~qualifier:DynamicRO "ipv6_addresses" "IPv6 addresses in CIDR format" ~default_value:(Some (VSet []));
            field ~ty:String ~in_product_since:rel_dundee ~qualifier:DynamicRO "ipv6_gateway" "IPv6 gateway (the empty string means that no gateway is set)" ~default_value:(Some (VString ""));
+           field ~ty:(Ref _pci) ~in_product_since:rel_kolkata ~internal_only:true ~qualifier:DynamicRO "reserved_pci" "pci of network SR-IOV VF which is reserved for this vif" ~default_value:(Some (VRef null_ref));
          ])
       ()
 end
@@ -4220,6 +4224,68 @@ let alert =
     ()
 *)
 
+(** network sriov **)
+module Network_sriov = struct
+  let lifecycle = [Published, rel_kolkata, ""]
+
+  let sriov_configuration_mode = Enum ("sriov_configuration_mode",
+    [
+      "sysfs", "Configure network sriov by sysfs, do not need reboot";
+      "modprobe", "Configure network sriov by modprobe, need reboot";
+      "unknown", "Unknown mode";
+    ])
+
+  let create = call
+      ~name:"create"
+      ~doc:"Enable SR-IOV on the specific PIF. It will create a network-sriov based on the specific PIF and automatically create a logical PIF to connect the specific network."
+      ~params:[Ref _pif, "pif", "PIF on which to enable SR-IOV";
+               Ref _network, "network", "Network to connect SR-IOV virtual functions with VM VIFs"]
+      ~result:(Ref _network_sriov, "The reference of the created network_sriov object")
+      ~lifecycle
+      ~allowed_roles:_R_POOL_OP
+      ()
+
+  let destroy = call
+      ~name:"destroy"
+      ~doc:"Disable SR-IOV on the specific PIF. It will destroy the network-sriov and the logical PIF accordingly."
+      ~params:[Ref _network_sriov, "self", "SRIOV to destroy"]
+      ~lifecycle
+      ~allowed_roles:_R_POOL_OP
+      ()
+
+  let get_remaining_capacity = call
+      ~name:"get_remaining_capacity"
+      ~doc:"Get the number of free SR-IOV VFs on the associated PIF"
+      ~params:[Ref _network_sriov, "self", "the NETWORK_SRIOV object"]
+      ~lifecycle
+      ~result:(Int, "The number of free SR-IOV VFs on the associated PIF")
+      ~allowed_roles:_R_READ_ONLY
+      ()
+
+  let t =
+    create_obj
+      ~name:_network_sriov
+      ~descr:"network-sriov which connects logical pif and physical pif"
+      ~doccomments:[]
+      ~gen_constructor_destructor:false
+      ~gen_events:true
+      ~in_db:true
+      ~lifecycle
+      ~messages:[create; destroy; get_remaining_capacity]
+      ~messages_default_allowed_roles:_R_POOL_OP
+      ~persist:PersistEverything
+      ~in_oss_since:None
+      ~contents:
+        ([
+          uid _network_sriov;
+          field ~qualifier:StaticRO ~ty:(Ref _pif) ~lifecycle "physical_PIF" "The PIF that has SR-IOV enabled" ~default_value:(Some (VRef ""));
+          field ~qualifier:StaticRO ~ty:(Ref _pif) ~lifecycle "logical_PIF" "The logical PIF to connect to the SR-IOV network after enable SR-IOV on the physical PIF" ~default_value:(Some (VRef ""));
+          field ~qualifier:DynamicRO ~ty:Bool ~lifecycle "requires_reboot" "Indicates whether the host need to be rebooted before SR-IOV is enabled on the physical PIF" ~default_value:(Some (VBool false));
+          field ~qualifier:DynamicRO ~ty:sriov_configuration_mode ~lifecycle "configuration_mode" "The mode for configure network sriov" ~default_value:(Some (VEnum "unknown"));
+        ])
+      ()
+end
+
 (** PCI devices *)
 
 module PCI = struct
@@ -4258,6 +4324,7 @@ module PCI = struct
         field ~qualifier:StaticRO ~ty:String ~lifecycle:[] "subsystem_device_id" "Subsystem device ID" ~default_value:(Some (VString "")) ~internal_only:true;
         field ~qualifier:StaticRO ~ty:String ~lifecycle:[Published, rel_clearwater_whetstone, ""] "subsystem_device_name" "Subsystem device name" ~default_value:(Some (VString ""));
         field ~qualifier:DynamicRO ~ty:(Ref _vm) ~lifecycle:[Published, rel_falcon, ""] ~internal_only:true "scheduled_to_be_attached_to" "The VM to which this PCI device is scheduled to be attached (passed through)" ~default_value:(Some (VRef null_ref));
+        field ~qualifier:StaticRO ~ty:String ~lifecycle:[Published, rel_kolkata, ""] "driver_name" "Driver name" ~default_value:(Some (VString ""));
       ]
       ()
 end
@@ -5255,6 +5322,7 @@ let all_system =
     Message.t;
     Secret.t;
     Tunnel.t;
+    Network_sriov.t;
     PCI.t;
     PGPU.t;
     GPU_group.t;
@@ -5366,6 +5434,8 @@ let all_relations =
     (_vusb, "VM"), (_vm, "VUSBs");
 
     (_feature, "host"), (_host, "features");
+    (_network_sriov, "physical_PIF"), (_pif, "sriov_physical_PIF_of");
+    (_network_sriov, "logical_PIF"), (_pif, "sriov_logical_PIF_of");
   ]
 
 (** the full api specified here *)
@@ -5457,6 +5527,7 @@ let expose_get_all_messages_for = [
   _pvs_cache_storage;
   _feature;
   _sdn_controller;
+  _network_sriov;
   (* _vdi_nbd_server_info must NOT be included here *)
   _pusb;
   _usb_group;

diff --git a/ocaml/idl/datamodel_common.ml b/ocaml/idl/datamodel_common.ml
@@ -169,6 +169,7 @@ let _vdi_nbd_server_info = "vdi_nbd_server_info"
 let _pusb = "PUSB"
 let _usb_group = "USB_group"
 let _vusb = "VUSB"
+let _network_sriov = "network_sriov"
 let _cluster = "Cluster"
 let _cluster_host = "Cluster_host"
 

diff --git a/ocaml/idl/datamodel_errors.ml b/ocaml/idl/datamodel_errors.ml
@@ -118,6 +118,32 @@ let _ =
   error Api_errors.user_is_not_local_superuser [ "msg" ]
     ~doc:"Only the local superuser can execute this operation" ();
 
+  (* SR-IOV errors *)
+  error Api_errors.network_sriov_insufficient_capacity [ "network" ]
+    ~doc:"There is insufficient capacity for VF reservation" ();
+  error Api_errors.network_sriov_already_enabled ["PIF"]
+    ~doc:"The PIF selected for the SR-IOV network is already enabled" ();
+  error Api_errors.network_sriov_enable_failed ["PIF"; "msg"]
+    ~doc:"Failed to enable SR-IOV on PIF" ();
+  error Api_errors.network_sriov_disable_failed ["PIF"; "msg"]
+    ~doc:"Failed to disable SR-IOV on PIF" ();
+  error Api_errors.network_has_incompatible_sriov_pifs ["PIF"; "network"]
+    ~doc:"The PIF is not compatible with the selected SR-IOV network" ();
+  error Api_errors.network_has_incompatible_vlan_on_sriov_pifs ["PIF"; "network"]
+    ~doc:"VLAN on the PIF is not compatible with the selected SR-IOV VLAN network" ();
+  error Api_errors.network_incompatible_with_sriov ["network"]
+    ~doc:"The network is incompatible with sriov" ();
+  error Api_errors.network_incompatible_with_vlan_on_bridge ["network"]
+    ~doc:"The network is incompatible with vlan on bridge" ();
+  error Api_errors.network_incompatible_with_vlan_on_sriov ["network"]
+    ~doc:"The network is incompatible with vlan on sriov" ();
+  error Api_errors.network_incompatible_with_bond ["network"]
+    ~doc:"The network is incompatible with bond" ();
+  error Api_errors.network_incompatible_with_tunnel ["network"]
+    ~doc:"The network is incompatible with tunnel" ();
+  error Api_errors.pool_joining_host_has_network_sriovs []
+    ~doc:"The host joining the pool must not have any network SR-IOVs." ();
+
   (* PIF/VIF/Network errors *)
   error Api_errors.network_unmanaged [ "network" ]
     ~doc:"The network is not managed by xapi." ();
@@ -129,9 +155,12 @@ let _ =
     ~doc:"You tried to add a purpose to a network but the new purpose is not compatible with an existing purpose of the network or other networks." ();
   error Api_errors.pif_is_physical ["PIF"]
     ~doc:"You tried to destroy a PIF, but it represents an aspect of the physical host configuration, and so cannot be destroyed.  The parameter echoes the PIF handle you gave." ();
+  error Api_errors.pif_is_not_physical ["PIF"]
+    ~doc:"You tried to perform an operation which is only available on physical PIF" ();
   error Api_errors.pif_is_vlan ["PIF"]
     ~doc:"You tried to create a VLAN on top of another VLAN - use the underlying physical PIF/bond instead" ();
-
+  error Api_errors.pif_is_sriov_logical ["PIF"]
+    ~doc:"You tried to create a bond on top of a network SR-IOV logical PIF - use the underlying physical PIF instead" ();
   error Api_errors.pif_vlan_exists ["PIF"]
     ~doc:"You tried to create a PIF, but it already exists." ();
   error Api_errors.pif_vlan_still_exists [ "PIF" ]
@@ -164,20 +193,30 @@ let _ =
     ~doc:"The operation you requested cannot be performed because the specified PIF has FCoE SR in use." ();
   error Api_errors.pif_unmanaged [ "PIF" ]
     ~doc:"The operation you requested cannot be performed because the specified PIF is not managed by xapi." ();
+  error Api_errors.pif_is_not_sriov_capable [ "PIF" ]
+    ~doc:"The selected PIF is not capable of network SR-IOV" ();
   error Api_errors.pif_has_no_network_configuration [ "PIF" ]
     ~doc:"PIF has no IP configuration (mode currently set to 'none')" ();
   error Api_errors.pif_has_no_v6_network_configuration [ "PIF" ]
     ~doc:"PIF has no IPv6 configuration (mode currently set to 'none')" ();
   error Api_errors.pif_incompatible_primary_address_type [ "PIF" ]
     ~doc:"The primary address types are not compatible" ();
+  error Api_errors.pif_sriov_still_exists [ "PIF" ]
+    ~doc:"The PIF is still related with a network SR-IOV" ();
   error Api_errors.cannot_plug_bond_slave ["PIF"]
     ~doc:"This PIF is a bond slave and cannot be plugged." ();
   error Api_errors.cannot_add_vlan_to_bond_slave ["PIF"]
     ~doc:"This PIF is a bond slave and cannot have a VLAN on it." ();
   error Api_errors.cannot_add_tunnel_to_bond_slave ["PIF"]
     ~doc:"This PIF is a bond slave and cannot have a tunnel on it." ();
+  error Api_errors.cannot_add_tunnel_to_sriov_logical ["PIF"]
+    ~doc:"This is a network SR-IOV logical PIF and cannot have a tunnel on it." ();
+  error Api_errors.cannot_add_tunnel_to_vlan_on_sriov_logical ["PIF"]
+    ~doc:"This is a vlan PIF on network SR-IOV and cannot have a tunnel on it." ();
   error Api_errors.cannot_change_pif_properties ["PIF"]
     ~doc:"This properties of this PIF cannot be changed. Only the properties of non-bonded physical PIFs, or bond masters can be changed." ();
+  error Api_errors.cannot_forget_sriov_logical [ "PIF" ]
+    ~doc:"This is a network SR-IOV logical PIF and cannot do forget on it" ();
   error Api_errors.incompatible_pif_properties []
     ~doc:"These PIFs can not be bonded, because their properties are different." ();
   error Api_errors.slave_requires_management_iface []
@@ -587,6 +626,8 @@ let _ =
     ~doc:"VM cannot be resumed because it has no suspend VDI" ();
   error Api_errors.vm_migrate_failed [ "vm"; "source"; "destination"; "msg" ]
     ~doc:"An error occurred during the migration process." ();
+  error Api_errors.vm_migrate_contact_remote_service_failed []
+    ~doc:"Failed to contact service on the destination host." ();
   error Api_errors.vm_has_too_many_snapshots [ "vm" ]
     ~doc:"You attempted to migrate a VM with more than one snapshot." ();
   error Api_errors.vm_has_checkpoint [ "vm" ]