NONRTRIC980: fixs for controlpanel kong, 'hunkey dory' and pms ports

Issue-ID: NONRTRIC-980
Change-Id: I48f8709e9cef1d6cbd010f50b7981782dbeddba7
Signed-off-by: DenisGNoonan <denis.noonan@est.tech>

diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric
index 651771b..e0c3306 100755 (executable)
--- a/bin/deploy-nonrtric
+++ b/bin/deploy-nonrtric
@@ -225,7 +225,7 @@ if [ "$INSTALL_KONG" = true ];then
   echo "Installing Kong"
   helm repo add kong https://charts.konghq.com --force-update
   helm repo update
-  helm install kong-nonrtric kong/kong -n ${NONRTRIC_NAMESPACE:-nonrtric} -f dep/nonrtric/helm/kongstorage/kongvalues.yaml
+  helm install oran-nonrtric kong/kong -n ${NONRTRIC_NAMESPACE:-nonrtric} -f dep/nonrtric/helm/kongstorage/kongvalues.yaml
 fi
 
 kubectl create configmap -n ${NONRTRIC_NAMESPACE:-nonrtric} nonrtric-recipe --from-file=recipe=$OVERRIDEYAML

diff --git a/bin/undeploy-nonrtric b/bin/undeploy-nonrtric
index af9a31d..adfe287 100755 (executable)
--- a/bin/undeploy-nonrtric
+++ b/bin/undeploy-nonrtric
@@ -66,7 +66,7 @@ if [ "$INSTALL_KONG" = true ];then
   echo "Uninstalling kongstorage"
   helm delete kongstorage -n "${NONRTRIC_NAMESPACE:-nonrtric}"
   echo "Uninstalling Kong"
-  helm delete kong-nonrtric -n ${NONRTRIC_NAMESPACE:-nonrtric}
+  helm delete oran-nonrtric -n ${NONRTRIC_NAMESPACE:-nonrtric}
 fi
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index d557e53..24f168d 100644 (file)
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -104,10 +104,10 @@ policymanagementservice:
     service:
       allowHttp: true
       httpName: http
-      internalPort1: 9080
+      internalPort1: 8081
       targetPort1: 8081
       httpsName: https
-      internalPort2: 9081
+      internalPort2: 8433
       targetPort2: 8433
     liveness:
       initialDelaySeconds: 20

diff --git a/nonrtric/data/run_in_k8s/populate_policy_data.sh b/nonrtric/data/run_in_k8s/populate_policy_data.sh
index 4a3f1b8..4f15e89 100755 (executable)
--- a/nonrtric/data/run_in_k8s/populate_policy_data.sh
+++ b/nonrtric/data/run_in_k8s/populate_policy_data.sh
@@ -25,7 +25,7 @@
 # one policy-type and one policy in a1-sim-STD2_0
 
 policy_agent_host="policymanagementservice"
-policy_agent_port="9080"
+policy_agent_port="8081"
 a1_sim_osc_0_host="a1-sim-osc-0.a1-sim"
 a1_sim_osc_0_port="8085"
 a1_sim_osc_1_host="a1-sim-osc-1.a1-sim"

diff --git a/nonrtric/helm/controlpanel/resources-ing/nginx.conf b/nonrtric/helm/controlpanel/resources-ing/nginx.conf
index d72eea7..4e53c54 100644 (file)
--- a/nonrtric/helm/controlpanel/resources-ing/nginx.conf
+++ b/nonrtric/helm/controlpanel/resources-ing/nginx.conf
@@ -4,7 +4,7 @@ http {
     include /etc/nginx/mime.types;
 
     upstream backend {
-        server  kong-proxy.kong:80;
+        server oran-nonrtric-kong-proxy.nonrtric:80;
     }
 
     server {
@@ -25,4 +25,4 @@ http {
             try_files $uri $uri/ /index.html;
         }
     }
-}
\ No newline at end of file
+}

diff --git a/nonrtric/helm/controlpanel/values.yaml b/nonrtric/helm/controlpanel/values.yaml
index a151950..e3e41dc 100644 (file)
--- a/nonrtric/helm/controlpanel/values.yaml
+++ b/nonrtric/helm/controlpanel/values.yaml
@@ -32,7 +32,7 @@ controlpanel:
     targetPort1: 8080
     externalPort1: 30091
     httpsName: https
-    internalPort2: 8081
+    internalPort2: 8082
     targetPort2: 8082
     externalPort2: 30092
   liveness:

diff --git a/nonrtric/helm/nonrtricgateway/resources/config/application.yaml b/nonrtric/helm/nonrtricgateway/resources/config/application.yaml
index 0d96d68..602252b 100644 (file)
--- a/nonrtric/helm/nonrtricgateway/resources/config/application.yaml
+++ b/nonrtric/helm/nonrtricgateway/resources/config/application.yaml
@@ -27,7 +27,7 @@ spring:
         wiretap: true
       routes:
       - id: A1-Policy
-        uri: https://policymanagementservice:9081
+        uri: https://policymanagementservice:8433
         predicates:
         - Path=/a1-policy/**
       - id: A1-EI

diff --git a/nonrtric/helm/policymanagementservice/values.yaml b/nonrtric/helm/policymanagementservice/values.yaml
index c6a312e..4e24f8c 100644 (file)
--- a/nonrtric/helm/policymanagementservice/values.yaml
+++ b/nonrtric/helm/policymanagementservice/values.yaml
@@ -28,10 +28,10 @@ policymanagementservice:
   service:
     allowHttp: true
     httpName: http
-    internalPort1: 9080
+    internalPort1: 8081
     targetPort1: 8081
     httpsName: https
-    internalPort2: 9081
+    internalPort2: 8433
     targetPort2: 8433
   liveness:
     initialDelaySeconds: 20

diff --git a/nonrtric/helm/servicemanager/values.yaml b/nonrtric/helm/servicemanager/values.yaml
index dbb261c..0cfaa05 100644 (file)
--- a/nonrtric/helm/servicemanager/values.yaml
+++ b/nonrtric/helm/servicemanager/values.yaml
@@ -38,12 +38,12 @@ data:
   .env: |
     # The Kong Data plane provides the endpoint that Service Manager gives to the rApp so that the rApp can invoke the CAPIF published API.
     # In a Kubernetes environment, we need to use the Kong NodePort IP and nodePort if the rApp needs access from outside the Kong cluster.
-    # From inside the Kong cluster, we can use the Kubernetes cluster DNS entry, kong-nonrtric-kong-proxy.nonrtric.svc.cluster.local.
+    # From inside the Kong cluster, we can use the Kubernetes cluster DNS entry, oran-nonrtric-kong-proxy.nonrtric.svc.cluster.local.
     KONG_DOMAIN: "kong"
     KONG_PROTOCOL: "http"
-    KONG_CONTROL_PLANE_IPV4: "kong-nonrtric-kong-admin.nonrtric.svc.cluster.local"
+    KONG_CONTROL_PLANE_IPV4: "oran-nonrtric-kong-admin.nonrtric.svc.cluster.local"
     KONG_CONTROL_PLANE_PORT: "8001"
-    KONG_DATA_PLANE_IPV4: "kong-nonrtric-kong-proxy.nonrtric.svc.cluster.local"
+    KONG_DATA_PLANE_IPV4: "oran-nonrtric-kong-proxy.nonrtric.svc.cluster.local"
     KONG_DATA_PLANE_PORT: "80"
     CAPIF_PROTOCOL: "http"
     CAPIF_IPV4: "capifcore.nonrtric.svc.cluster.local"

diff --git a/smo-install/oran_oom/controlpanel/resources-ing/nginx.conf b/smo-install/oran_oom/controlpanel/resources-ing/nginx.conf
index 374861f..4e53c54 100644 (file)
--- a/smo-install/oran_oom/controlpanel/resources-ing/nginx.conf
+++ b/smo-install/oran_oom/controlpanel/resources-ing/nginx.conf
@@ -1,9 +1,12 @@
 events{}
+
 http {
     include /etc/nginx/mime.types;
+
     upstream backend {
-        server  kong-proxy.kong:80;
+        server oran-nonrtric-kong-proxy.nonrtric:80;
     }
+
     server {
         listen 8080;
         server_name localhost;

diff --git a/smo-install/oran_oom/servicemanager/values.yaml b/smo-install/oran_oom/servicemanager/values.yaml
index a0a4ffd..fb53671 100644 (file)
--- a/smo-install/oran_oom/servicemanager/values.yaml
+++ b/smo-install/oran_oom/servicemanager/values.yaml
@@ -61,7 +61,7 @@ data:
   .env: |
     # The Kong Data plane provides the endpoint that Service Manager gives to the rApp so that the rApp can invoke the CAPIF published API.
     # In a Kubernetes environment, we need to use the Kong NodePort IP and nodePort if the rApp needs access from outside the Kong cluster.
-    # From inside the Kong cluster, we can use the Kubernetes cluster DNS entry, kong-nonrtric-kong-proxy.nonrtric.svc.cluster.local.
+    # From inside the Kong cluster, we can use the Kubernetes cluster DNS entry, oran-nonrtric-kong-proxy.nonrtric.svc.cluster.local.
     KONG_DOMAIN: "kong"
     KONG_PROTOCOL: "http"
     KONG_CONTROL_PLANE_IPV4: "oran-nonrtric-kong-admin.nonrtric.svc.cluster.local"

diff --git a/smo-install/test/a1-validation/subscripts/health_check.sh b/smo-install/test/a1-validation/subscripts/health_check.sh
index 9f675ab..3857b30 100755 (executable)
--- a/smo-install/test/a1-validation/subscripts/health_check.sh
+++ b/smo-install/test/a1-validation/subscripts/health_check.sh
@@ -4,7 +4,7 @@ enrichment_service_url=${1:-localhost:9082}
 a1_sim_OSC_url=${2:-localhost:8085}
 a1_sim_STD_url=${3:-localhost:8085}
 a1_sim_STD_v2_url=${4:-localhost:8085}
-policy_agent_url=${5:-localhost:9080}
+policy_agent_url=${5:-localhost:8081}
 a1_controller_url=${6:false}
 
 echo -e "NONRTRIC HealthCheck\n"
@@ -47,7 +47,7 @@ checkStatus "curl -vskw %{http_code} http://$a1_sim_STD_v2_url/" "OK200" "SIM3"
 
 # check PMS status
 echo "check Policy Agent status:"
-checkStatus "curl -vskw %{http_code} http://$policy_agent_url/status" "hunky dory200" "PMS"
+checkStatus "curl -vskw %{http_code} http://$policy_agent_url/status" "success200" "PMS"
 
 # check ECS status
 echo "check Enrichment service status:"

diff --git a/smo-install/test/a1-validation/subscripts/prepareDmaapMsg.sh b/smo-install/test/a1-validation/subscripts/prepareDmaapMsg.sh
index 9a06a86..2d3fd23 100755 (executable)
--- a/smo-install/test/a1-validation/subscripts/prepareDmaapMsg.sh
+++ b/smo-install/test/a1-validation/subscripts/prepareDmaapMsg.sh
@@ -31,7 +31,7 @@ dmaap_mr_url=${1:-localhost:3904}
 a1_sim_OSC_url=${2:-localhost:8085}
 a1_sim_STD_url=${3:-localhost:8085}
 a1_sim_STD_v2_url=${4:-localhost:8085}
-policy_agent_url=${5:-localhost:9081}
+policy_agent_url=${5:-localhost:8081}
 httpx=${6:-"http"}
 
 echo "using dmaap-mr url: "$dmaap_mr_url

diff --git a/smo-install/test/a1-validation/subscripts/preparePmsData.sh b/smo-install/test/a1-validation/subscripts/preparePmsData.sh
index 4919481..fc874e0 100755 (executable)
--- a/smo-install/test/a1-validation/subscripts/preparePmsData.sh
+++ b/smo-install/test/a1-validation/subscripts/preparePmsData.sh
@@ -29,7 +29,7 @@
 
 a1_sim_OSC_url=${1:-localhost:8085}
 a1_sim_STD_v2_url=${2:-localhost:8085}
-policy_agent_url=${3:-localhost:9081}
+policy_agent_url=${3:-localhost:8081}
 httpx=${4:-"http"}
 SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
 
@@ -52,7 +52,7 @@ echo "policy agent status:"
 curlString="curl -skw %{http_code} $httpx://$policy_agent_url/status"
 res=$($curlString)
 echo "$res"
-expect="hunky dory200"
+expect="success200"
 checkRes
 echo -e "\n"