From eff54762d7295ae377ecc87df57d382106727fa3 Mon Sep 17 00:00:00 2001 From: Yash Gupta Date: Mon, 20 Aug 2018 16:50:50 +0900 Subject: [PATCH] PodVIFDriver impl - fix release_vif() signature Some of the implementations of PodVIFDriver do not have the project_id and security_groups parameters, resulting in runtime exceptions if these drivers are used with handlers that expect base class signature to be followed. Change-Id: Id1972e02f71238771062cdebec37a3a8a22d768b Closes-Bug: 1787918 Signed-off-by: Yash Gupta (cherry picked from commit b52f8204a868817fd81e8c57e30b9904bdc080e2) --- kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py | 2 +- kuryr_kubernetes/controller/drivers/nested_vlan_vif.py | 2 +- kuryr_kubernetes/controller/drivers/neutron_vif.py | 2 +- kuryr_kubernetes/controller/drivers/vif_pool.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py b/kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py index 746502a6e..2f050054f 100755 --- a/kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py +++ b/kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py @@ -53,7 +53,7 @@ class NestedMacvlanPodVIFDriver(nested_vif.NestedPodVIFDriver): # TODO(mchiappe): provide an implementation raise NotImplementedError() - def release_vif(self, pod, vif): + def release_vif(self, pod, vif, project_id=None, security_groups=None): neutron = clients.get_neutron_client() container_port = neutron.show_port(vif.id).get('port') diff --git a/kuryr_kubernetes/controller/drivers/nested_vlan_vif.py b/kuryr_kubernetes/controller/drivers/nested_vlan_vif.py index 19934bc2f..aee4fc124 100644 --- a/kuryr_kubernetes/controller/drivers/nested_vlan_vif.py +++ b/kuryr_kubernetes/controller/drivers/nested_vlan_vif.py @@ -106,7 +106,7 @@ class NestedVlanPodVIFDriver(nested_vif.NestedPodVIFDriver): vifs.append(vif) return vifs - def release_vif(self, pod, vif): + def release_vif(self, pod, vif, project_id=None, security_groups=None): neutron = clients.get_neutron_client() parent_port = self._get_parent_port(neutron, pod) trunk_id = self._get_trunk_id(parent_port) diff --git a/kuryr_kubernetes/controller/drivers/neutron_vif.py b/kuryr_kubernetes/controller/drivers/neutron_vif.py index b45b0acb7..60ae92926 100644 --- a/kuryr_kubernetes/controller/drivers/neutron_vif.py +++ b/kuryr_kubernetes/controller/drivers/neutron_vif.py @@ -70,7 +70,7 @@ class NeutronPodVIFDriver(base.PodVIFDriver): vifs.append(vif) return vifs - def release_vif(self, pod, vif): + def release_vif(self, pod, vif, project_id=None, security_groups=None): neutron = clients.get_neutron_client() try: diff --git a/kuryr_kubernetes/controller/drivers/vif_pool.py b/kuryr_kubernetes/controller/drivers/vif_pool.py index 386a94bf3..bd7b51667 100644 --- a/kuryr_kubernetes/controller/drivers/vif_pool.py +++ b/kuryr_kubernetes/controller/drivers/vif_pool.py @@ -69,7 +69,7 @@ class NoopVIFPool(base.VIFPoolDriver): security_groups) def release_vif(self, pod, vif, *argv): - self._drv_vif.release_vif(pod, vif) + self._drv_vif.release_vif(pod, vif, *argv) def activate_vif(self, pod, vif): self._drv_vif.activate_vif(pod, vif)