Changed networkd id dynamically in response object for Create Resource Data Operation

- in cps-charts, added second dmi-stub
- in order to demo for two dmi-stub instances in kubernetes cluster,
  Create Resource Data Operation should return a composite network id of:
    dmiAddress + cmHandleId in response
- added env. variable name to change dmi-stub server port for the second
  instance

Issue-ID: CPS-2934

Change-Id: Iaf20d8e9a8a2c0245219004baf16bad787b0a356
Signed-off-by: halil.cakal <halil.cakal@est.tech>

diff --git a/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
index 6a8530f..33975b0 100644 (file)
--- a/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
+++ b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
@@ -69,6 +69,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
 @RestController
 @RequestMapping("${rest.api.dmi-stub-base-path}")
@@ -222,7 +223,7 @@ public class DmiRestStubController {
 
         final String sampleJson = ResourceFileReaderUtil.getResourceFileContent(applicationContext.getResource(
                 ResourceLoader.CLASSPATH_URL_PREFIX + "data/ietf-network-topology-sample-rfc8345.json"));
-        return ResponseEntity.ok(sampleJson);
+        return ResponseEntity.ok(sampleJson.replace("#network-id", getCompositeNetworkId(cmHandleId)));
     }
 
     /**
@@ -414,4 +415,13 @@ public class DmiRestStubController {
             Thread.currentThread().interrupt();
         }
     }
+
+    private static String getCompositeNetworkId(final String cmHandleId) {
+        final String servletUri = ServletUriComponentsBuilder
+            .fromCurrentContextPath()    // scheme://host:port
+            .build()
+            .toUriString();
+        return servletUri + "-" + cmHandleId; // e.g. http://cps-ncmp-dmi-stub-1:8092-my-cm-handle
+    }
+
 }

diff --git a/dmi-stub/dmi-stub-service/src/main/resources/application.yml b/dmi-stub/dmi-stub-service/src/main/resources/application.yml
index e8a15ec..65a1bec 100644 (file)
--- a/dmi-stub/dmi-stub-service/src/main/resources/application.yml
+++ b/dmi-stub/dmi-stub-service/src/main/resources/application.yml
@@ -16,7 +16,7 @@
 #  SPDX-License-Identifier: Apache-2.0
 #  ============LICENSE_END=========================================================
 server:
-    port: 8092
+    port: ${DMI_STUB_SERVER_PORT:8092}
 
 rest:
     api:

diff --git a/dmi-stub/dmi-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json b/dmi-stub/dmi-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json
index 8f9dbc2..0c77fb7 100644 (file)
--- a/dmi-stub/dmi-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json
+++ b/dmi-stub/dmi-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345.json
@@ -4,7 +4,7 @@
          {
            "network-types": {
            },
-           "network-id": "otn-hc",
+           "network-id": "#network-id",
            "node": [
              {
                "node-id": "D1",