controller: Upd. remaining refs to generic vif

In 97ded78 we renamed GenericPodVIFDriver to the more accurate NeutronPodVIFDriver. Unfortunately we missed a few places. This patch solves that. Change-Id: I441e7236f9e2bb1f64ad5ae5bcc43218adf5abb3 Signed-off-by: Antoni Segura Puimedon <[email protected]>
kfaseela · Jun 7, 2017 · 87039c6 · 87039c6
1 parent 97ded78
commit 87039c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/doc/source/devref/kuryr_kubernetes_design.rst b/doc/source/devref/kuryr_kubernetes_design.rst
@@ -156,13 +156,13 @@ drivers. There are drivers that handle the Pod based on the project, subnet
 and security groups specified via configuration settings during cluster
 deployment phase.
 
-GenericPodVifDriver
+NeutronPodVifDriver
 ~~~~~~~~~~~~~~~~~~~
 PodVifDriver subclass should implement request_vif, release_vif and
 activate_vif methods. In case request_vif returns Vif object in down state,
 Controller will invoke activate_vif.  Vif ‘active’ state is required by the
 CNI driver to complete pod handling.
-The GenericPodVifDriver is the default driver that creates neutron port upon
+The NeutronPodVifDriver is the default driver that creates neutron port upon
 Pod addition and deletes port upon Pod removal.
 
 CNI Driver

diff --git a/doc/source/devref/port_manager.rst b/doc/source/devref/port_manager.rst
@@ -118,9 +118,9 @@ corresponding pool is empty, a ResourceNotReady exception will be triggered and
 the pool will be repopulated.
 
 In addition to the handler modification and the new pool drivers there are
-changes related to the VIF drivers. The VIF drivers (generic and nested) will
-be extended to support bulk ports creation of Neutron ports and similarly for
-the VIF objects requests.
+changes related to the VIF drivers. The VIF drivers (neutron-vif and nested)
+will be extended to support bulk ports creation of Neutron ports and similarly
+for the VIF objects requests.
 
 Future enhancement
 ''''''''''''''''''

diff --git a/kuryr_kubernetes/config.py b/kuryr_kubernetes/config.py
@@ -63,7 +63,7 @@
         default='default'),
     cfg.StrOpt('pod_vif_driver',
         help=_("The driver that provides VIFs for Kubernetes Pods."),
-        default='generic'),
+        default='neutron-vif'),
     cfg.StrOpt('endpoints_lbaas_driver',
         help=_("The driver that provides LoadBalancers for Kubernetes "
                "Endpoints"),

diff --git a/setup.cfg b/setup.cfg
@@ -58,7 +58,7 @@ kuryr_kubernetes.controller.drivers.service_security_groups =
     default = kuryr_kubernetes.controller.drivers.default_security_groups:DefaultServiceSecurityGroupsDriver
 
 kuryr_kubernetes.controller.drivers.pod_vif =
-    generic = kuryr_kubernetes.controller.drivers.generic_vif:GenericPodVIFDriver
+    neutron-vif = kuryr_kubernetes.controller.drivers.neutron_vif:NeutronPodVIFDriver
     nested-vlan = kuryr_kubernetes.controller.drivers.nested_vlan_vif:NestedVlanPodVIFDriver
 
 kuryr_kubernetes.controller.drivers.endpoints_lbaas =