diff --git a/devstack/devstackgaterc b/devstack/devstackgaterc index c17b20318..bae7e3135 100644 --- a/devstack/devstackgaterc +++ b/devstack/devstackgaterc @@ -20,7 +20,7 @@ export OVERRIDE_ENABLED_SERVICES=key,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,g-api,g-reg,c-sch,c-api,c-vol,horizon,rabbit,mysql,dstat,df-controller,df-redis,df-redis-server,q-svc,df-l3-agent,df-metadata,q-qos,placement-api,df-bgp export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_REDIS_PUBSUB=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_RUNNING_IN_GATE=True" -export DEVSTACK_LOCAL_CONFIG+=$'\n'"SNAT_HOST_IP=172.24.4.100" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"EXTERNAL_HOST_IP=172.24.4.100" if [ -n "${DEVSTACK_GATE_TEMPEST}"] && [ ${DEVSTACK_GATE_TEMPEST} -gt 0 ]; then # Only include tempest if this is a tempest job diff --git a/devstack/devstackgaterc-zmq b/devstack/devstackgaterc-zmq index 444135fcb..6e4d68fa9 100644 --- a/devstack/devstackgaterc-zmq +++ b/devstack/devstackgaterc-zmq @@ -23,7 +23,7 @@ export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_SELECTIVE_TOPO_DIST=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_PORT_STATUS_NOTIFIER=False" export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_ACTIVE_DETECTION=False" export DEVSTACK_LOCAL_CONFIG+=$'\n'"DF_RUNNING_IN_GATE=True" -export DEVSTACK_LOCAL_CONFIG+=$'\n'"SNAT_HOST_IP=172.24.4.100" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"EXTERNAL_HOST_IP=172.24.4.100" if [ -n "${DEVSTACK_GATE_TEMPEST}"] && [ ${DEVSTACK_GATE_TEMPEST} -gt 0 ]; then # Only include tempest if this is a tempest job diff --git a/devstack/plugin.sh b/devstack/plugin.sh index b47c90dfe..0ca2b9c1e 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -13,8 +13,8 @@ OVS_REPO_NAME=$(basename ${OVS_REPO} | cut -f1 -d'.') # The branch to use from $OVS_REPO OVS_BRANCH=${OVS_BRANCH:-branch-2.6} -#Set empty SNAT_HOST_IP -SNAT_HOST_IP=${SNAT_HOST_IP:-} +# Set empty EXTERNAL_HOST_IP +EXTERNAL_HOST_IP=${EXTERNAL_HOST_IP:-} DEFAULT_TUNNEL_TYPE="geneve" DEFAULT_APPS_LIST="l2_app.L2App,l3_proactive_app.L3ProactiveApp,"\ @@ -31,7 +31,7 @@ if [[ "$ENABLE_ACTIVE_DETECTION" == "True" ]]; then DEFAULT_APPS_LIST="$DEFAULT_APPS_LIST,active_port_detection_app.ActivePortDetectionApp" fi -if [[ ! -z ${SNAT_HOST_IP} ]]; then +if [[ ! -z ${EXTERNAL_HOST_IP} ]]; then DEFAULT_APPS_LIST="$DEFAULT_APPS_LIST,chassis_snat_app.ChassisSNATApp" fi @@ -247,8 +247,8 @@ function configure_df_plugin { iniset $DRAGONFLOW_CONF df_dnat_app external_network_bridge "$PUBLIC_BRIDGE" iniset $DRAGONFLOW_CONF df_dnat_app int_peer_patch_port "$INTEGRATION_PEER_PORT" iniset $DRAGONFLOW_CONF df_dnat_app ex_peer_patch_port "$PUBLIC_PEER_PORT" - if [[ ! -z ${SNAT_HOST_IP} ]]; then - iniset $DRAGONFLOW_CONF df_snat_app external_host_ip "$SNAT_HOST_IP" + if [[ ! -z ${EXTERNAL_HOST_IP} ]]; then + iniset $DRAGONFLOW_CONF df external_host_ip "$EXTERNAL_HOST_IP" fi if [[ "$DF_PUB_SUB" == "True" ]]; then diff --git a/dragonflow/conf/df_common_params.py b/dragonflow/conf/df_common_params.py index 9966a9790..c5f470aca 100644 --- a/dragonflow/conf/df_common_params.py +++ b/dragonflow/conf/df_common_params.py @@ -170,7 +170,9 @@ df_opts = [ cfg.IntOpt('neutron_listener_report_delay', default=10, help=_('The max delay in seconds for Neutron to report heart' - 'beat to df-db')) + 'beat to df-db')), + cfg.StrOpt('external_host_ip', + help=_("Compute node external IP")) ] diff --git a/dragonflow/conf/df_snat.py b/dragonflow/conf/df_snat.py index 331192f4b..9cbb0d457 100644 --- a/dragonflow/conf/df_snat.py +++ b/dragonflow/conf/df_snat.py @@ -18,8 +18,6 @@ from oslo_config import cfg from dragonflow._i18n import _ df_snat_app_opts = [ - cfg.StrOpt('external_host_ip', - help=_("Compute node external IP")), cfg.BoolOpt('enable_goto_flows', default=True, help=_("Enable install of common goto flows to ingress/egress " diff --git a/dragonflow/controller/chassis_snat_app.py b/dragonflow/controller/chassis_snat_app.py index 41d15126d..68bd8ba5c 100644 --- a/dragonflow/controller/chassis_snat_app.py +++ b/dragonflow/controller/chassis_snat_app.py @@ -43,7 +43,7 @@ class ChassisSNATApp(df_base_app.DFlowApp, snat_mixin.SNATApp_mixin): self.chassis = None # new application configuration - self.external_host_ip = cfg.CONF.df_snat_app.external_host_ip + self.external_host_ip = cfg.CONF.df.external_host_ip self.enable_goto_flows = cfg.CONF.df_snat_app.enable_goto_flows # create mac address based on given 'external_host_ip' diff --git a/dragonflow/controller/df_local_controller.py b/dragonflow/controller/df_local_controller.py index 1b9581fc0..b6d907b77 100644 --- a/dragonflow/controller/df_local_controller.py +++ b/dragonflow/controller/df_local_controller.py @@ -400,8 +400,8 @@ class DfLocalController(object): ip=self.ip, tunnel_types=self.tunnel_types, ) - if cfg.CONF.df_snat_app.external_host_ip: - chassis.external_host_ip = cfg.CONF.df_snat_app.external_host_ip + if cfg.CONF.df.external_host_ip: + chassis.external_host_ip = cfg.CONF.df.external_host_ip self.db_store2.update(chassis) diff --git a/dragonflow/tests/fullstack/test_snat_flows.py b/dragonflow/tests/fullstack/test_snat_flows.py index 6a1fcd404..e22bd1bc4 100644 --- a/dragonflow/tests/fullstack/test_snat_flows.py +++ b/dragonflow/tests/fullstack/test_snat_flows.py @@ -56,7 +56,7 @@ class TestSnatFlows(test_base.DFTestBase): 'name': 'private', 'enable_dhcp': True} - external_host_ip = cfg.CONF.df_snat_app.external_host_ip + external_host_ip = cfg.CONF.df.external_host_ip self.assertIsNotNone(external_host_ip) split_ip = external_host_ip.split('.') ip2mac = '{:02x}:{:02x}:{:02x}:{:02x}'.format(*map(int, split_ip)) diff --git a/dragonflow/tests/unit/test_chassis_snat_app.py b/dragonflow/tests/unit/test_chassis_snat_app.py index 98a57039e..36231ef6a 100644 --- a/dragonflow/tests/unit/test_chassis_snat_app.py +++ b/dragonflow/tests/unit/test_chassis_snat_app.py @@ -27,7 +27,7 @@ class TestChassisSNATApp(test_app_base.DFAppTestBase): def setUp(self): cfg.CONF.set_override('external_host_ip', self.external_host_ip, - group='df_snat_app') + group='df') super(TestChassisSNATApp, self).setUp() self.SNAT_app = self.open_flow_app.dispatcher.apps[0] self.SNAT_app.external_ofport = 99 diff --git a/dragonflow/tests/unit/test_df_local_controller.py b/dragonflow/tests/unit/test_df_local_controller.py index 717d77b25..2a6890246 100644 --- a/dragonflow/tests/unit/test_df_local_controller.py +++ b/dragonflow/tests/unit/test_df_local_controller.py @@ -207,7 +207,7 @@ class DfLocalControllerTestCase(test_app_base.DFAppTestBase): def test_register_chassis(self): cfg.CONF.set_override('external_host_ip', '172.24.4.100', - group='df_snat_app') + group='df') self.controller.register_chassis() expected_chassis = core.Chassis( id=self.controller.chassis_name,