x
/
group-based-policy
Code Issues Proposed changes

Using aliases instead long names in the plugin configuration 

Used aliase names for all long names in plugin configuration.

Change-Id: Idc858e0af14ccd2d63155d90d6e8e842d23d8f12
Closes-Bug: 1638913
This commit is contained in:
DhuldevValekar 2016-11-03 18:43:14 +05:30
parent 2a73335a55
commit b4d04c7bea
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gbpservice/contrib/nfp/tools/setup_nfp.py
View File

@ -101,25 +101,25 @@ def configure_nfp():
curr_service_plugins_list.remove("servicechain")
if not len(vpnaas_enabled):
curr_service_plugins_list.append("neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin")
curr_service_plugins_list.append("vpnaas")
else:
for word in vpnaas_enabled:
curr_service_plugins_list.remove(word)
curr_service_plugins_list.append("neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin")
curr_service_plugins_list.append("vpnaas")
if not len(lbaas_enabled):
curr_service_plugins_list.append("neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin")
curr_service_plugins_list.append("lbaas")
else:
for word in lbaas_enabled:
curr_service_plugins_list.remove(word)
curr_service_plugins_list.append("neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin")
curr_service_plugins_list.append("lbaas")
if not len(fwaas_enabled):
curr_service_plugins_list.append("gbpservice.contrib.nfp.service_plugins.firewall.nfp_fwaas_plugin.NFPFirewallPlugin")
curr_service_plugins_list.append("nfp_fwaas")
else:
for word in fwaas_enabled:
curr_service_plugins_list.remove(word)
curr_service_plugins_list.append("gbpservice.contrib.nfp.service_plugins.firewall.nfp_fwaas_plugin.NFPFirewallPlugin")
curr_service_plugins_list.append("nfp_fwaas")
new_service_plugins_list = curr_service_plugins_list
new_service_plugins = ",".join(new_service_plugins_list)

4
gbpservice/contrib/nfp/tools/utils/lbaas_version_change.sh
View File

@ -18,7 +18,7 @@ move_to_v2() { #LBaaSV1 to LBaaSV2
fi
# Change service plugin
sudo sed -i "s/neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin/neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2/g" /etc/neutron/neutron.conf
sudo sed -i "s/lbaas/lbaasv2/g" /etc/neutron/neutron.conf
# Change service provider
sudo sed -i "s/LOADBALANCER:loadbalancer:gbpservice.contrib.nfp.service_plugins.loadbalancer.drivers.nfp_lbaas_plugin_driver.HaproxyOnVMPluginDriver/LOADBALANCERV2:loadbalancerv2:gbpservice.contrib.nfp.service_plugins.loadbalancer.drivers.nfp_lbaasv2_plugin_driver.HaproxyOnVMPluginDriver/g" /etc/neutron/neutron_lbaas.conf
@ -43,7 +43,7 @@ move_to_v1() { #LBaaSV2 to LBaaSV1
fi
# Change service plugin
sudo sed -i "s/neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2/neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin/g" /etc/neutron/neutron.conf
sudo sed -i "s/lbaasv2/lbaas/g" /etc/neutron/neutron.conf
# Change service provider
sudo sed -i "s/LOADBALANCERV2:loadbalancerv2:gbpservice.contrib.nfp.service_plugins.loadbalancer.drivers.nfp_lbaasv2_plugin_driver.HaproxyOnVMPluginDriver/LOADBALANCER:loadbalancer:gbpservice.contrib.nfp.service_plugins.loadbalancer.drivers.nfp_lbaas_plugin_driver.HaproxyOnVMPluginDriver/g" /etc/neutron/neutron_lbaas.conf

2
setup.cfg
View File

@ -51,7 +51,7 @@ neutron.service_plugins =
msc = gbpservice.neutron.services.servicechain.plugins.msc.plugin:ServiceChainPlugin
ncp = gbpservice.neutron.services.servicechain.plugins.ncp.plugin:NodeCompositionPlugin
apic_gbp_l3 = gbpservice.neutron.services.l3_router.l3_apic:ApicGBPL3ServicePlugin
nfp_fwaas = gbpservice.contrib.nfp.service_plugins.firewall.nfp_fwaas_plugin.NFPFirewallPlugin
nfp_fwaas = gbpservice.contrib.nfp.service_plugins.firewall.nfp_fwaas_plugin:NFPFirewallPlugin
apic_aim_l3 = gbpservice.neutron.services.apic_aim.l3_plugin:ApicL3Plugin
gbpservice.neutron.group_policy.extension_drivers =
test = gbpservice.neutron.tests.unit.services.grouppolicy.test_extension_driver_api:TestExtensionDriver