From: Todd Malsbary <todd.malsbary@intel.com>
Date: Fri, 13 May 2022 00:15:44 +0000 (-0700)
Subject: Fix EMCO test for v22.03
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=icn.git;a=commitdiff_plain;h=15415d35d2056804d883632d32204281d6cad33c

Fix EMCO test for v22.03

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I2c18d9cf3c12933f03d2a1f60fc2175533052d46
---

diff --git a/deploy/addons/addons.sh b/deploy/addons/addons.sh
index 865664f..672096e 100755
--- a/deploy/addons/addons.sh
+++ b/deploy/addons/addons.sh
@@ -38,7 +38,7 @@ metadata:
   name: rsync
 spec:
   host: ${host}
-  port: 30441
+  port: 30431
 ---
 version: emco/v2
 resourceContext:
@@ -47,7 +47,7 @@ metadata:
   name: gac
 spec:
   host: ${host}
-  port: 30493
+  port: 30433
   type: "action"
   priority: 1
 ---
@@ -58,7 +58,7 @@ metadata:
   name: ovnaction
 spec:
   host: ${host}
-  port: 30473
+  port: 30432
   type: "action"
   priority: 1
 ---
@@ -69,7 +69,7 @@ metadata:
   name: dtc
 spec:
   host: ${host}
-  port: 30483
+  port: 30448
   type: "action"
   priority: 1
 EOF
diff --git a/deploy/addons/plugin_fw_v2.patch b/deploy/addons/plugin_fw_v2.patch
index 461a46d..958973d 100644
--- a/deploy/addons/plugin_fw_v2.patch
+++ b/deploy/addons/plugin_fw_v2.patch
@@ -1,3 +1,39 @@
+diff --git a/kud/tests/plugin_fw_v2.sh b/kud/tests/plugin_fw_v2.sh
+index 6c8d842..b4f01cb 100755
+--- a/kud/tests/plugin_fw_v2.sh
++++ b/kud/tests/plugin_fw_v2.sh
+@@ -96,24 +96,27 @@ function setup {
+ orchestrator:
+   host: ${service_host}
+   port: 30415
++  statusPort: 30416
+ clm:
+   host: ${service_host}
+   port: 30461
+ ncm:
+   host: ${service_host}
+-  port: 30431
++  port: 30481
++  statusPort: 30482
+ ovnaction:
+   host: ${service_host}
+-  port: 30471
++  port: 30451
+ dcm:
+   host: ${service_host}
+   port: 30477
++  statusPort: 30478
+ gac:
+   host: ${service_host}
+-  port: 30491
++  port: 30420
+ dtc:
+  host: ${service_host}
+- port: 30481
++ port: 30418
+ EOF
+     cat <<EOF >plugin_fw_v2_values.yaml
+ ClusterProvider: vfw-cluster-provider
 diff --git a/kud/tests/plugin_fw_v2.yaml b/kud/tests/plugin_fw_v2.yaml
 index b4dbf77..940ed6d 100644
 --- a/kud/tests/plugin_fw_v2.yaml