diff -Nru nova-15.0.0~b2/debian/changelog nova-15.0.0~b2/debian/changelog
--- nova-15.0.0~b2/debian/changelog	2016-12-21 18:53:22.000000000 +0000
+++ nova-15.0.0~b2/debian/changelog	2017-01-23 09:55:39.000000000 +0000
@@ -1,3 +1,10 @@
+nova (2:15.0.0~b2-0ubuntu3) zesty; urgency=medium
+
+  * d/p/os-vif-1.4-compat.patch: Cherry pick patch for compat
+    with os-vif >= 1.4.
+
+ -- James Page <james.page@ubuntu.com>  Mon, 23 Jan 2017 09:55:39 +0000
+
 nova (2:15.0.0~b2-0ubuntu2) zesty; urgency=medium
 
   * d/t/*: Drop nova-network from tests as it is being
diff -Nru nova-15.0.0~b2/debian/patches/os-vif-1.4-compat.patch nova-15.0.0~b2/debian/patches/os-vif-1.4-compat.patch
--- nova-15.0.0~b2/debian/patches/os-vif-1.4-compat.patch	1970-01-01 00:00:00.000000000 +0000
+++ nova-15.0.0~b2/debian/patches/os-vif-1.4-compat.patch	2017-01-23 09:33:03.000000000 +0000
@@ -0,0 +1,37 @@
+From d33a2b1cbb0fb497b8612ee66822cd48fe4acfe6 Mon Sep 17 00:00:00 2001
+From: Matt Riedemann <mriedem@us.ibm.com>
+Date: Thu, 12 Jan 2017 11:49:52 -0500
+Subject: [PATCH] Make unit tests work with os-vif 1.4.0
+
+The expected VIFHostUser object in this test is setting the
+vif_name field on the object which didn't actually exist until
+version 1.1 of that object which is being released in os-vif 1.4.0.
+
+The test passes against os-vif 1.3.0 and VIFHostUser 1.0 today
+because the obj_to_primitive() routine will not include anything
+that's not a field on the object, which is vif_name in this case.
+
+But when moving to os-vif 1.4.0, we're hitting a failure because
+the expected object has vif_name set but the actual object doesn't
+because though the vif_name field is defined, it's not actually
+used yet in the code, so it's not set in the primitive and our
+object comparison fails.
+
+Change-Id: I1c27726d583a41ab69d9eab23e8484e7e047942d
+Closes-Bug: #1656025
+---
+ nova/tests/unit/network/test_os_vif_util.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/nova/tests/unit/network/test_os_vif_util.py b/nova/tests/unit/network/test_os_vif_util.py
+index e58509b..a4ccb47 100644
+--- a/nova/tests/unit/network/test_os_vif_util.py
++++ b/nova/tests/unit/network/test_os_vif_util.py
+@@ -572,7 +572,6 @@ def test_nova_to_osvif_vhostuser_ovs(self):
+             plugin="ovs",
+             port_profile=osv_objects.vif.VIFPortProfileOpenVSwitch(
+                 interface_id="dc065497-3c8d-4f44-8fb4-e1d33c16a536"),
+-            vif_name="nicdc065497-3c",
+             path='/fake/socket',
+             mode='client',
+             has_traffic_filtering=True,
diff -Nru nova-15.0.0~b2/debian/patches/series nova-15.0.0~b2/debian/patches/series
--- nova-15.0.0~b2/debian/patches/series	2016-12-21 18:53:22.000000000 +0000
+++ nova-15.0.0~b2/debian/patches/series	2017-01-23 09:55:32.000000000 +0000
@@ -1,2 +1,4 @@
 # Ubuntu specific patches below here. Note these can be dropped eventually.
 arm-console-patch.patch
+# Cherry picks
+os-vif-1.4-compat.patch