Merge "Add path for EI Consumer"

diff --git a/docker-compose/control-panel/config/nginx.conf b/docker-compose/control-panel/config/nginx.conf
index 916caef..3416fd4 100644 (file)
--- a/docker-compose/control-panel/config/nginx.conf
+++ b/docker-compose/control-panel/config/nginx.conf
@@ -16,8 +16,12 @@ http {
             set $upstream nonrtric-gateway;
             proxy_pass http://$upstream:9090;
         }
+        location /data-consumer/{
+            set $upstream nonrtric-gateway;
+            proxy_pass http://$upstream:9090;
+        }
         location / {
             try_files $uri $uri/ /index.html;
         }
     }
-}
\ No newline at end of file
+}

diff --git a/docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml b/docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml
index 656ebaf..fb8c106 100644 (file)
--- a/docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml
+++ b/docker-compose/nonrtric-gateway/config/application-nonrtricgateway.yaml
@@ -33,7 +33,7 @@ spring:
       - id: A1-EI
         uri: https://localhost:8434
         predicates:
-        - Path=/data-producer/**
+        - Path=/data-producer/**,/data-consumer/**
 management:
   endpoint:
     gateway:
@@ -49,4 +49,4 @@ logging:
     org.springframework.cloud.gateway: INFO
     reactor.netty: INFO
   file:
-    name: /var/log/nonrtric-gateway/application.log
\ No newline at end of file
+    name: /var/log/nonrtric-gateway/application.log

diff --git a/nonrtric-gateway/config/application.yaml b/nonrtric-gateway/config/application.yaml
index 656ebaf..fb8c106 100644 (file)
--- a/nonrtric-gateway/config/application.yaml
+++ b/nonrtric-gateway/config/application.yaml
@@ -33,7 +33,7 @@ spring:
       - id: A1-EI
         uri: https://localhost:8434
         predicates:
-        - Path=/data-producer/**
+        - Path=/data-producer/**,/data-consumer/**
 management:
   endpoint:
     gateway:
@@ -49,4 +49,4 @@ logging:
     org.springframework.cloud.gateway: INFO
     reactor.netty: INFO
   file:
-    name: /var/log/nonrtric-gateway/application.log
\ No newline at end of file
+    name: /var/log/nonrtric-gateway/application.log

diff --git a/webapp-frontend/nginx.conf b/webapp-frontend/nginx.conf
index 916caef..3416fd4 100644 (file)
--- a/webapp-frontend/nginx.conf
+++ b/webapp-frontend/nginx.conf
@@ -16,8 +16,12 @@ http {
             set $upstream nonrtric-gateway;
             proxy_pass http://$upstream:9090;
         }
+        location /data-consumer/{
+            set $upstream nonrtric-gateway;
+            proxy_pass http://$upstream:9090;
+        }
         location / {
             try_files $uri $uri/ /index.html;
         }
     }
-}
\ No newline at end of file
+}

diff --git a/webapp-frontend/proxy.conf.json b/webapp-frontend/proxy.conf.json
index becd017..3284709 100644 (file)
--- a/webapp-frontend/proxy.conf.json
+++ b/webapp-frontend/proxy.conf.json
@@ -6,5 +6,9 @@
   "/data-producer": {
     "target": "http://localhost:9090",
     "secure": false
- }
-}
\ No newline at end of file
+  },
+  "/data-consumer": {
+    "target": "http://localhost:9090",
+    "secure": false
+  }
+}