Uplift from ONAP.

Support for custom A1 adapters.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-743
Change-Id: I1729693a66edb7c83d71c0ebf780843de3fb1b7d

diff --git a/config/application.yaml b/config/application.yaml
index 54f47e0..7628624 100644 (file)
--- a/config/application.yaml
+++ b/config/application.yaml
@@ -42,7 +42,7 @@ logging:
     org.springframework.data: ERROR
     org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
     org.onap.ccsdk.oran.a1policymanagementservice: INFO
-    # org.onap.ccsdk.oran.a1policymanagementservice.tasks: TRACE  
+    # org.onap.ccsdk.oran.a1policymanagementservice.tasks: TRACE
   file:
     name: /var/log/policy-agent/application.log
 server:
@@ -74,8 +74,8 @@ app:
     http.proxy-type: HTTP
   # path where the service can store data
   vardata-directory: /var/policy-management-service
-  # the config-file-schema-path referres to a location in the jar file. If this property is empty or missing, 
-  # no schema validation will be executed. 
+  # the config-file-schema-path referres to a location in the jar file. If this property is empty or missing,
+  # no schema validation will be executed.
   config-file-schema-path: /application_configuration_schema.json
   # A file containing an authorization token, which shall be inserted in each HTTP header (authorization).
   # If the file name is empty, no authorization token is sent.

diff --git a/config/application_configuration.json b/config/application_configuration.json
index 6187c86..29d5923 100644 (file)
--- a/config/application_configuration.json
+++ b/config/application_configuration.json
@@ -1,6 +1,6 @@
 {
    "description": "Application configuration",
-   "config": {  
+   "config": {
       "controller": [
          {
             "name": "controller1",
@@ -13,12 +13,29 @@
          {
             "name": "ric1",
             "baseUrl": "http://ric1:8085/",
-            "controller": "controller1",
             "managedElementIds": [
                "kista_1",
                "kista_2"
             ]
+         },
+         {
+            "name": "ric2",
+            "baseUrl": "http://localhost:8081/",
+            "customAdapterClass": "org.onap.ccsdk.oran.a1policymanagementservice.clients.StdA1ClientVersion2$Factory",
+            "managedElementIds": [
+               "kista_3",
+               "kista_4"
+            ]
+         },
+         {
+            "name": "ric3",
+            "baseUrl": "http://ric1:8085/",
+            "controller": "controller1",
+            "managedElementIds": [
+               "kista_5",
+               "kista_6"
+            ]
          }
       ]
    }
-}
+}
\ No newline at end of file

diff --git a/onap/oran b/onap/oran
index e9ddfb1..feed7a7 160000 (submodule)
--- a/onap/oran
+++ b/onap/oran
@@ -1 +1 @@
-Subproject commit e9ddfb1e0e0b256986d24aa02129e2e3850bb480
+Subproject commit feed7a7eb0405135c014713887536595651ab83a

diff --git a/pom.xml b/pom.xml
index 905a56c..01f1f76 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -115,12 +115,6 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.immutables</groupId>
-            <artifactId>value</artifactId>
-            <version>${immutable.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>gson</artifactId>
@@ -374,4 +368,4 @@
         <system>JIRA</system>
         <url>https://jira.o-ran-sc.org/</url>
     </issueManagement>
-</project>
+</project>
\ No newline at end of file