Return 5kb of data with ProvMnS requests

- Only returns data for endpoints used in k6 tests (GET & PATCH)

Issue-ID: CPS-3133
Change-Id: I48507692b7fdae7bd8dece9d6cd026a23a05ac92
Signed-off-by: seanbeirne <sean.beirne@est.tech>

diff --git a/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/ProvMnsStubController.java b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/ProvMnsStubController.java
index 20e0094..a12c794 100644 (file)
--- a/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/ProvMnsStubController.java
+++ b/dmi-stub/dmi-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/ProvMnsStubController.java
@@ -20,10 +20,8 @@
 
 package org.onap.cps.ncmp.dmi.rest.stub.controller;
 
 
 package org.onap.cps.ncmp.dmi.rest.stub.controller;
 

-import com.fasterxml.jackson.databind.ObjectMapper;

 import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import jakarta.servlet.http.HttpServletRequest;
 import java.util.ArrayList;

-import java.util.Collections;

 import java.util.List;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.List;
 import java.util.Optional;
 import java.util.regex.Matcher;


@@ -38,8 +36,11 @@ import org.onap.cps.ncmp.dmi.provmns.model.PatchOperation;
 import org.onap.cps.ncmp.dmi.provmns.model.Resource;
 import org.onap.cps.ncmp.dmi.provmns.model.ResourceOneOf;
 import org.onap.cps.ncmp.dmi.provmns.model.Scope;
 import org.onap.cps.ncmp.dmi.provmns.model.Resource;
 import org.onap.cps.ncmp.dmi.provmns.model.ResourceOneOf;
 import org.onap.cps.ncmp.dmi.provmns.model.Scope;

+import org.onap.cps.ncmp.dmi.rest.stub.utils.ResourceFileReaderUtil;

 import org.onap.cps.ncmp.dmi.rest.stub.utils.Sleeper;
 import org.springframework.beans.factory.annotation.Value;
 import org.onap.cps.ncmp.dmi.rest.stub.utils.Sleeper;
 import org.springframework.beans.factory.annotation.Value;

+import org.springframework.context.ApplicationContext;
+import org.springframework.core.io.ResourceLoader;

 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;


@@ -58,12 +59,11 @@ public class ProvMnsStubController implements ProvMnS {
     static final Pattern PATTERN_SLOW_RESPONSE = Pattern.compile("slowResponse_(\\d{1,3})");
 
     private final Sleeper sleeper;
     static final Pattern PATTERN_SLOW_RESPONSE = Pattern.compile("slowResponse_(\\d{1,3})");
 
     private final Sleeper sleeper;

-    private final ObjectMapper objectMapper;
+    private final ApplicationContext applicationContext;

 
     static {
         dummyResource.setObjectClass("dummyClass");
         dummyResource.setObjectInstance("dummyInstance");
 
     static {
         dummyResource.setObjectClass("dummyClass");
         dummyResource.setObjectInstance("dummyInstance");

-        dummyResource.setAttributes(Collections.singletonMap("dummyAttribute", "dummy value"));

     }
 
     @Value("${delay.provmns-read-delay-ms}")
     }
 
     @Value("${delay.provmns-read-delay-ms}")


@@ -120,6 +120,9 @@ public class ProvMnsStubController implements ProvMnS {
                 scope, filter, attributes, fields, dataNodeSelector);
         final Optional<ResponseEntity<Object>> optionalResponseEntity = simulate(httpServletRequest,
             provMnSReadDelayMs);
                 scope, filter, attributes, fields, dataNodeSelector);
         final Optional<ResponseEntity<Object>> optionalResponseEntity = simulate(httpServletRequest,
             provMnSReadDelayMs);

+        final String sampleFiveKbJson = ResourceFileReaderUtil.getResourceFileContent(applicationContext.getResource(
+            ResourceLoader.CLASSPATH_URL_PREFIX + "data/ietf-network-topology-sample-rfc8345-large.json"));
+        dummyResource.setAttributes(sampleFiveKbJson);

         return optionalResponseEntity.orElseGet(() -> new ResponseEntity<>(dummyResource, HttpStatus.OK));
     }
 
         return optionalResponseEntity.orElseGet(() -> new ResponseEntity<>(dummyResource, HttpStatus.OK));
     }
 


@@ -134,8 +137,12 @@ public class ProvMnsStubController implements ProvMnS {
     public ResponseEntity<Object> patchMoi(final HttpServletRequest httpServletRequest,
                                            final List<PatchItem> patchItems) {
         log.info("patchMoi: {}", patchItems);
     public ResponseEntity<Object> patchMoi(final HttpServletRequest httpServletRequest,
                                            final List<PatchItem> patchItems) {
         log.info("patchMoi: {}", patchItems);

+        final String sampleFiveKbJson = ResourceFileReaderUtil.getResourceFileContent(applicationContext.getResource(
+            ResourceLoader.CLASSPATH_URL_PREFIX + "data/ietf-network-topology-sample-rfc8345-large.json"));
+        final PatchItem addOperationPatchItem = new PatchItem(PatchOperation.ADD, "/path=setByStub");
+        addOperationPatchItem.setValue(sampleFiveKbJson);

         final List<PatchItem> stubResponse = new ArrayList<>();
         final List<PatchItem> stubResponse = new ArrayList<>();

-        stubResponse.add(new PatchItem(PatchOperation.ADD, "/path=setByStub"));
+        stubResponse.add(addOperationPatchItem);

         stubResponse.add(new PatchItem(PatchOperation.REMOVE, "/path=alsoSetByStub"));
         final Optional<ResponseEntity<Object>> optionalResponseEntity = simulate(httpServletRequest,
             provMnSWriteDelayMs);
         stubResponse.add(new PatchItem(PatchOperation.REMOVE, "/path=alsoSetByStub"));
         final Optional<ResponseEntity<Object>> optionalResponseEntity = simulate(httpServletRequest,
             provMnSWriteDelayMs);

diff --git a/dmi-stub/dmi-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345-large.json b/dmi-stub/dmi-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345-large.json
new file mode 100644 (file)
index 0000000..6a67213
--- /dev/null
+++ b/dmi-stub/dmi-stub-service/src/main/resources/data/ietf-network-topology-sample-rfc8345-large.json
@@ -0,0 +1,129 @@
+{
+  "network-types": {
+    "ietf-network-topology:nmpts-topology": {}
+  },
+  "network-id": "enterprise-backbone-core-01",
+  "node": [
+      {
+        "node-id": "D1-CORE-ROUTER-SFO",
+        "termination-point": [
+          {"tp-id": "eth-1-0-1-gigabit-ethernet-port"},
+          {"tp-id": "eth-1-2-1-optical-fiber-backplane"},
+          {"tp-id": "eth-1-3-1-redundant-uplink-path"},
+          {"tp-id": "eth-1-4-1-management-interface-primary"},
+          {"tp-id": "eth-1-5-1-auxiliary-console-port-vty"},
+          {"tp-id": "eth-1-6-1-inter-chassis-link-stack"}
+        ],
+        "supporting-node": [
+          {"network-ref": "physical-layer", "node-ref": "PN-SFO-01"}
+        ]
+      },
+      {
+        "node-id": "D2-CORE-ROUTER-NYC",
+        "termination-point": [
+          {"tp-id": "eth-2-0-1-gigabit-ethernet-port"},
+          {"tp-id": "eth-2-1-1-optical-fiber-backplane"},
+          {"tp-id": "eth-2-3-1-redundant-uplink-path"},
+          {"tp-id": "eth-2-4-1-management-interface-primary"},
+          {"tp-id": "eth-2-5-1-auxiliary-console-port-vty"},
+          {"tp-id": "eth-2-6-1-inter-chassis-link-stack"}
+        ],
+        "supporting-node": [
+          {"network-ref": "physical-layer", "node-ref": "PN-NYC-01"}
+        ]
+      },
+      {
+        "node-id": "D3-DIST-SWITCH-CHI",
+        "termination-point": [
+          {"tp-id": "ge-3-1-1-access-port-vlan10"},
+          {"tp-id": "ge-3-2-1-access-port-vlan20"},
+          {"tp-id": "ge-3-4-1-trunk-link-to-core"},
+          {"tp-id": "ge-3-5-1-wifi-ap-backhaul"},
+          {"tp-id": "ge-3-0-1-local-management-console"}
+        ]
+      },
+      {
+        "node-id": "D4-DIST-SWITCH-LON",
+        "termination-point": [
+          {"tp-id": "ge-4-1-1-access-port-vlan10"},
+          {"tp-id": "ge-4-2-1-access-port-vlan20"},
+          {"tp-id": "ge-4-3-1-trunk-link-to-core"},
+          {"tp-id": "ge-4-5-1-wifi-ap-backhaul"},
+          {"tp-id": "ge-4-0-1-local-management-console"}
+        ]
+      },
+      {
+        "node-id": "D5-EDGE-FIREWALL-TOK",
+        "termination-point": [
+          {"tp-id": "fw-5-1-1-untrusted-outside-zone"},
+          {"tp-id": "fw-5-2-1-trusted-inside-zone"},
+          {"tp-id": "fw-5-3-1-dmz-zone-public-servers"},
+          {"tp-id": "fw-5-4-1-vpn-concentrator-link"},
+          {"tp-id": "fw-5-0-1-ha-heartbeat-interface"}
+        ]
+      },
+      {
+        "node-id": "D6-EDGE-FIREWALL-SYD",
+        "termination-point": [
+          {"tp-id": "fw-6-1-1-untrusted-outside-zone"},
+          {"tp-id": "fw-6-2-1-trusted-inside-zone"},
+          {"tp-id": "fw-6-3-1-dmz-zone-public-servers"},
+          {"tp-id": "fw-6-4-1-vpn-concentrator-link"},
+          {"tp-id": "fw-6-0-1-ha-heartbeat-interface"}
+        ]
+      }
+    ],
+    "ietf-network-topology:link": [
+      {
+        "link-id": "link-sfo-to-nyc-high-speed-backbone-001",
+        "source": {"source-node": "D1-CORE-ROUTER-SFO", "source-tp": "eth-1-2-1-optical-fiber-backplane"},
+        "destination": {"dest-node": "D2-CORE-ROUTER-NYC", "dest-tp": "eth-2-1-1-optical-fiber-backplane"}
+      },
+      {
+        "link-id": "link-nyc-to-sfo-high-speed-backbone-001",
+        "source": {"source-node": "D2-CORE-ROUTER-NYC", "source-tp": "eth-2-1-1-optical-fiber-backplane"},
+        "destination": {"dest-node": "D1-CORE-ROUTER-SFO", "dest-tp": "eth-1-2-1-optical-fiber-backplane"}
+      },
+      {
+        "link-id": "link-chi-to-sfo-regional-distribution-002",
+        "source": {"source-node": "D3-DIST-SWITCH-CHI", "source-tp": "ge-3-1-1-access-port-vlan10"},
+        "destination": {"dest-node": "D1-CORE-ROUTER-SFO", "dest-tp": "eth-1-3-1-redundant-uplink-path"}
+      },
+      {
+        "link-id": "link-sfo-to-chi-regional-distribution-002",
+        "source": {"source-node": "D1-CORE-ROUTER-SFO", "source-tp": "eth-1-3-1-redundant-uplink-path"},
+        "destination": {"dest-node": "D3-DIST-SWITCH-CHI", "dest-tp": "ge-3-1-1-access-port-vlan10"}
+      },
+      {
+        "link-id": "link-lon-to-nyc-transatlantic-link-003",
+        "source": {"source-node": "D4-DIST-SWITCH-LON", "source-tp": "ge-4-1-1-access-port-vlan10"},
+        "destination": {"dest-node": "D2-CORE-ROUTER-NYC", "dest-tp": "eth-2-3-1-redundant-uplink-path"}
+      },
+      {
+        "link-id": "link-nyc-to-lon-transatlantic-link-003",
+        "source": {"source-node": "D2-CORE-ROUTER-NYC", "source-tp": "eth-2-3-1-redundant-uplink-path"},
+        "destination": {"dest-node": "D4-DIST-SWITCH-LON", "dest-tp": "ge-4-1-1-access-port-vlan10"}
+      },
+      {
+        "link-id": "link-tok-to-sfo-pacific-rim-backhaul-004",
+        "source": {"source-node": "D5-EDGE-FIREWALL-TOK", "source-tp": "fw-5-1-1-untrusted-outside-zone"},
+        "destination": {"dest-node": "D1-CORE-ROUTER-SFO", "dest-tp": "eth-1-5-1-auxiliary-console-port-vty"}
+      },
+      {
+        "link-id": "link-sfo-to-tok-pacific-rim-backhaul-004",
+        "source": {"source-node": "D1-CORE-ROUTER-SFO", "source-tp": "eth-1-5-1-auxiliary-console-port-vty"},
+        "destination": {"dest-node": "D5-EDGE-FIREWALL-TOK", "dest-tp": "fw-5-1-1-untrusted-outside-zone"}
+      },
+      {
+        "link-id": "link-syd-to-sfo-management-trunk-vlan-999",
+        "source": {"source-node": "D6-EDGE-FIREWALL-SYD", "source-tp": "fw-6-1-1-untrusted-outside-zone"},
+        "destination": {"dest-node": "D1-CORE-ROUTER-SFO", "dest-tp": "eth-1-6-1-inter-chassis-link-stack"}
+      },
+      {
+        "link-id": "link-sfo-to-syd-management-trunk-vlan-999",
+        "source": {"source-node": "D1-CORE-ROUTER-SFO", "source-tp": "eth-1-6-1-inter-chassis-link-stack"},
+        "destination": {"dest-node": "D6-EDGE-FIREWALL-SYD", "dest-tp": "fw-6-1-1-untrusted-outside-zone"}
+      }
+    ]
+}
+