From: Lathish <lathishbabu.ganesan@est.tech>
Date: Mon, 18 May 2020 13:04:33 +0000 (+0100)
Subject: Port issue fix in control panel
X-Git-Tag: f-release~102^2~1
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=it%2Fdep.git;a=commitdiff_plain;h=e9f208bb87c52bdb221775f5e3dad7d661b74b50

Port issue fix in control panel

Issue-ID: NONRTRIC-219
Change-Id: I14460ea84eea347c404cd0c3da724305c926d935
Signed-off-by: Lathish <lathishbabu.ganesan@est.tech>
---

diff --git a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
index 5a52499b..4a7d3f0b 100644
--- a/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
+++ b/nonrtric/RECIPE_EXAMPLE/example_recipe.yaml
@@ -30,7 +30,7 @@ a1controller:
   a1controller:
     imagePullPolicy: IfNotPresent
     image:
-      registry: 'nexus3.o-ran-sc.org:10002/o-ran-sc'
+      registry: 'nexus3.o-ran-sc.org:10004/o-ran-sc'
       name: nonrtric-a1-controller
       tag: 1.7.4
     replicaCount: 1
diff --git a/nonrtric/helm/controlpanel/resources/application.properties b/nonrtric/helm/controlpanel/resources/application.properties
index 9c42bba0..acf20928 100644
--- a/nonrtric/helm/controlpanel/resources/application.properties
+++ b/nonrtric/helm/controlpanel/resources/application.properties
@@ -13,7 +13,8 @@
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
 ################################################################################
-server.port = 8080
+server.port = 8082
+server.http.port = 8080
 policycontroller.url.prefix = http://policymanagementservice:8081
 userfile = users.json
 portalapi.decryptor = org.oransc.portal.nonrtric.controlpanel.portalapi.PortalSdkDecryptorAes
diff --git a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
index fcf0f3b6..4c3e18af 100644
--- a/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
+++ b/nonrtric/helm/policymanagementservice/resources/config/application_configuration.json
@@ -11,7 +11,7 @@
        "ric":[
           {
              "name":"ric1",
-             "baseUrl":"http://a1-sim-osc-0.a1-sim:8085/",
+             "baseUrl":"http://a1-sim-osc-0.a1-sim:8085",
              "controller": "controller1",
              "managedElementIds":[
                 "kista_1",
@@ -20,7 +20,7 @@
           },
           {
             "name":"ric2",
-            "baseUrl":"http://a1-sim-osc-1.a1-sim:8085/",
+            "baseUrl":"http://a1-sim-osc-1.a1-sim:8085",
             "controller": "controller1",
             "managedElementIds":[
                "kista_1",
@@ -29,7 +29,7 @@
          },
           {
             "name":"ric3",
-            "baseUrl":"http://a1-sim-std-0.a1-sim:8085/",
+            "baseUrl":"http://a1-sim-std-0.a1-sim:8085",
             "controller": "controller1",
             "managedElementIds":[
                "kista_1",