COMPASS-440

add config for onos_sfc ci job

Change-Id: I2ae0e4339a8388de8b83b4f2e39edfc465892a20
Signed-off-by: CNlucius <lukai1@huawei.com>

diff --git a/deploy/client.py b/deploy/client.py
index 8617a56..2831678 100644 (file)
--- a/deploy/client.py
+++ b/deploy/client.py
@@ -238,6 +238,9 @@ opts = [
     cfg.StrOpt('odl_l3_agent',
               help='odl l3 agent enable flag',
               default='Disable'),
+    cfg.StrOpt('onos_sfc',
+              help='onos_sfc enable flag',
+              default='Disable'),
 ]
 CONF.register_cli_opts(opts)
 
@@ -727,6 +730,7 @@ class CompassClient(object):
         package_config['enable_fwaas'] = (CONF.enable_fwaas== "true")
         package_config['enable_vpnaas'] = (CONF.enable_vpnaas== "true")
         package_config['odl_l3_agent'] = "Enable" if CONF.odl_l3_agent == "Enable" else "Disable"
+        package_config['onos_sfc'] = "Enable" if CONF.onos_sfc == "Enable" else "Disable"
 
         status, resp = self.client.update_cluster_config(
             cluster_id, package_config=package_config)

diff --git a/deploy/deploy_host.sh b/deploy/deploy_host.sh
index 2e2ec71..22d9656 100755 (executable)
--- a/deploy/deploy_host.sh
+++ b/deploy/deploy_host.sh
@@ -45,7 +45,7 @@ function deploy_host(){
     --deployment_timeout="${DEPLOYMENT_TIMEOUT}" --${POLL_SWITCHES_FLAG} --dashboard_url="${DASHBOARD_URL}" \
     --cluster_vip="${VIP}" --network_cfg="$NETWORK" --neutron_cfg="$NEUTRON" \
     --enable_secgroup="${ENABLE_SECGROUP}" --enable_fwaas="${ENABLE_FWAAS}" \
-    --rsa_file="$rsa_file" --enable_vpnaas="${ENABLE_VPNAAS}" --odl_l3_agent="${odl_l3_agent}"
+    --rsa_file="$rsa_file" --enable_vpnaas="${ENABLE_VPNAAS}" --odl_l3_agent="${odl_l3_agent}" --onos_sfc="${onos_sfc}"
 
     RET=$?
     sleep $((AYNC_TIMEOUT+5))