summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuan Xie <huan.xie@citrix.com>2017-03-06 02:10:33 -0800
committerHuan Xie <huan.xie@citrix.com>2017-03-06 02:10:33 -0800
commitbeae63e1849d6f5f14d0e77df248a1959d949fd5 (patch)
tree455ff028afcc73685924780843829f7e1bb72648
parent72fa7036e3bf80d092afabe6bb926b493d522685 (diff)
Support vif hotplug in Mitaka
I have made a patch to apply several new patch file in nova-compute, see https://review.openstack.org/#/c/430030/, but these patch files are based on newton or ocata, for vif hotplug, the attach_interface API changed, there is a new parameter added after mitaka, see https://review.openstack.org/#/c/147126/, so this patch is to remove parameter context so it can be compatible with mitaka Change-Id: I7f767c21d87d61c13ba5d272f869628210dc5d02
Notes
Notes (review): Verified+1: Citrix XenServer CI Code-Review+2: Jianghua Wang <jianghua.wang@citrix.com> Workflow+1: Huan Xie <huan.xie@citrix.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 07 Mar 2017 08:10:00 +0000 Reviewed-on: https://review.openstack.org/441865 Project: openstack/fuel-plugin-xenserver Branch: refs/heads/master
-rw-r--r--plugin_source/deployment_scripts/patchset/support-vif-hotplug.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin_source/deployment_scripts/patchset/support-vif-hotplug.patch b/plugin_source/deployment_scripts/patchset/support-vif-hotplug.patch
index b56a66d..1dec234 100644
--- a/plugin_source/deployment_scripts/patchset/support-vif-hotplug.patch
+++ b/plugin_source/deployment_scripts/patchset/support-vif-hotplug.patch
@@ -21,7 +21,7 @@ index 77483fa..899c083 100644
21 """ 21 """
22 return self._vmops.get_per_instance_usage() 22 return self._vmops.get_per_instance_usage()
23+ 23+
24+ def attach_interface(self, context, instance, image_meta, vif): 24+ def attach_interface(self, instance, image_meta, vif):
25+ """Use hotplug to add a network interface to a running instance. 25+ """Use hotplug to add a network interface to a running instance.
26+ 26+
27+ The counter action to this is :func:`detach_interface`. 27+ The counter action to this is :func:`detach_interface`.
@@ -40,7 +40,7 @@ index 77483fa..899c083 100644
40+ """ 40+ """
41+ self._vmops.attach_interface(instance, vif) 41+ self._vmops.attach_interface(instance, vif)
42+ 42+
43+ def detach_interface(self, context, instance, vif): 43+ def detach_interface(self, instance, vif):
44+ """Use hotunplug to remove a network interface from a running instance. 44+ """Use hotunplug to remove a network interface from a running instance.
45+ 45+
46+ The counter action to this is :func:`attach_interface`. 46+ The counter action to this is :func:`attach_interface`.