From: selias Date: Tue, 29 Nov 2016 08:39:00 +0000 (+0100) Subject: CSIT-454: HC Test: Update module feature names X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=fa74b0cda008687827c255c1f2a51c5c44300870 CSIT-454: HC Test: Update module feature names - outdated due to HC project change - split to honeycomb and hc2vpp Change-Id: If9e3c9baf7787067eff6a759be1ad9aa386c6e0f Signed-off-by: selias --- diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py index 99f334e3b4..bee27ab095 100644 --- a/resources/libraries/python/honeycomb/HoneycombSetup.py +++ b/resources/libraries/python/honeycomb/HoneycombSetup.py @@ -310,7 +310,7 @@ class HoneycombSetup(object): """ disabled_features = { - "NSH": "io.fd.honeycomb.vppnsh.impl.VppNshModule" + "NSH": "io.fd.hc2vpp.vppnsh.impl.VppNshModule" } ssh = SSH() @@ -321,7 +321,7 @@ class HoneycombSetup(object): find = replace = "{0}".format(disabled_features[feature]) argument = '"/{0}/c\\ {1}"'.format(find, replace) - path = "{0}/modules/io-fd-honeycomb-vpp-integration*module-config"\ + path = "{0}/modules/*module-config"\ .format(Const.REMOTE_HC_DIR) command = "sed -i {0} {1}".format(argument, path) diff --git a/resources/tools/download_hc_pkgs.sh b/resources/tools/download_hc_pkgs.sh index 136f6fc63b..0cfdd85b23 100755 --- a/resources/tools/download_hc_pkgs.sh +++ b/resources/tools/download_hc_pkgs.sh @@ -22,7 +22,7 @@ URL="https://nexus.fd.io/service/local/artifact/maven/content" VER="RELEASE" REPO='fd.io.master.ubuntu.trusty.main' GROUP="io.fd.vpp" -HC_GROUP="io.fd.honeycomb" +HC_GROUP="io.fd.hc2vpp" NSH_GROUP="io.fd.nsh_sfc" VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins" HC_ARTIFACTS="honeycomb"