Displaying 2 results from an estimated 2 matches for "5e2fabfa9".
2018 Mar 23
2
[PATCH] v2v: ova: convert E1000 network interfaces as such
...e -> None in
       let nic = {
         s_mac = mac;
-        s_nic_model = None;
+        s_nic_model = nic_model;
         s_vnet = vnet;
         s_vnet_orig = vnet;
         s_vnet_type = vnet_type;
diff --git a/v2v/test-v2v-i-ova-formats.expected b/v2v/test-v2v-i-ova-formats.expected
index 5e2fabfa9..f7b79d7bc 100644
--- a/v2v/test-v2v-i-ova-formats.expected
+++ b/v2v/test-v2v-i-ova-formats.expected
@@ -17,5 +17,5 @@ disks:
 removable media:
 	CD-ROM [ide] in slot 0
 NICs:
-	Bridge "PG-VLAN60"
+	Bridge "PG-VLAN60" [e1000]
 
diff --git a/v2v/test-v2v-i-ova-gz.expected b/v2v/...
2018 Mar 23
0
Re: [PATCH] v2v: ova: convert E1000 network interfaces as such
...s_mac = mac;
> -        s_nic_model = None;
> +        s_nic_model = nic_model;
>          s_vnet = vnet;
>          s_vnet_orig = vnet;
>          s_vnet_type = vnet_type;
> diff --git a/v2v/test-v2v-i-ova-formats.expected b/v2v/test-v2v-i-ova-formats.expected
> index 5e2fabfa9..f7b79d7bc 100644
> --- a/v2v/test-v2v-i-ova-formats.expected
> +++ b/v2v/test-v2v-i-ova-formats.expected
> @@ -17,5 +17,5 @@ disks:
>  removable media:
>  	CD-ROM [ide] in slot 0
>  NICs:
> -	Bridge "PG-VLAN60"
> +	Bridge "PG-VLAN60" [e1000]
>  
>...