From d3e424d83e7d0310cf6ec992fb88cf185788725f Mon Sep 17 00:00:00 2001
From: garciay <yann.garcia@fscom.fr>
Date: Mon, 12 Aug 2024 16:16:59 +0200
Subject: [PATCH] Finalize meep-federation service skeleton

---
 config/.meepctl-repocfg.yaml                  |  6 ++-
 .../src/js/containers/app-container.js        |  2 +-
 .../frontend/src/js/util/scenario-utils.js    | 51 +++++++------------
 3 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/config/.meepctl-repocfg.yaml b/config/.meepctl-repocfg.yaml
index cf535cb..e50dad7 100644
--- a/config/.meepctl-repocfg.yaml
+++ b/config/.meepctl-repocfg.yaml
@@ -308,7 +308,7 @@ repo:
           # - meep-tc-engine
           # - meep-app-enablement
           # - meep-vis
-          - meep-federation
+          # - meep-federation
         # location of API specifications
         api:
           - name: 'AdvantEDGE Monitoring Engine REST API'
@@ -439,7 +439,7 @@ repo:
           # - meep-tc-engine
           # - meep-app-enablement
           # - meep-vis
-          - meep-federation
+          # - meep-federation
       meep-webhook:
         # location of source code
         src: go-apps/meep-webhook
@@ -966,6 +966,8 @@ repo:
             file: go-apps/meep-federation/api/swagger.yaml
         # location of user supplied API specifications
         user-api:
+          - name: 'Federation Service REST API'
+            file: config/api/fed-api.yaml
         # resources available to docker container image
         docker-data:
           # location of entry script
diff --git a/js-apps/frontend/src/js/containers/app-container.js b/js-apps/frontend/src/js/containers/app-container.js
index eeea90e..ac387e5 100644
--- a/js-apps/frontend/src/js/containers/app-container.js
+++ b/js-apps/frontend/src/js/containers/app-container.js
@@ -120,7 +120,7 @@ const apiTableMaxSize = 100;
 var metricsQuery = {
 /*  tags: [{
     name: 'logger_name',
-    value: 'meep-loc-serv,meep-federation,meep-rnis,meep-dai,meep-wais,meep-app-enablement'
+    value: 'meep-loc-serv,meep-federation,meep-rnis,meep-dai,meep-vis,meep-federation,meep-wais,meep-app-enablement'
   }],
 */
   fields: ['id', 'endpoint', 'url', 'method', 'resp_code', 'resp_body', 'body', 'proc_time', 'logger_name', 'direction'],
diff --git a/js-apps/frontend/src/js/util/scenario-utils.js b/js-apps/frontend/src/js/util/scenario-utils.js
index 73dd168..39abc1e 100644
--- a/js-apps/frontend/src/js/util/scenario-utils.js
+++ b/js-apps/frontend/src/js/util/scenario-utils.js
@@ -659,40 +659,23 @@ export function parseEdgeApps(scenario) {
                   disableInProgressCount: -1
                 });
               // MEC040
-            } else if (proc.image.includes('meep-federation')) {
-              // App support
-              edgeApps.push({
-                id: proc.id,
-                name: proc.name,
-                instance: '',
-                img: proc.image,
-                mepName: pl.name,
-                env: proc.environment,
-                url: 'api/?urls.primaryName='+pl.name+'%20-%20MEC%20Federation%20Service%20API',
-                path: pl.name+'/mec_app_support/v2',
-                pseudoName: 'MEC Application Support (011) on ' + pl.name,
-                dropDownName: 'MEC Application Support (011)',
-                enabled: true,  // always running
-                enableInProgressCount: -1,
-                disableInProgressCount: -1
-              });
-              // Service Management
-              edgeApps.push({
-                id: proc.id,
-                name: proc.name+'-service-mgmt',
-                instance: '',
-                img: proc.image,
-                mepName: pl.name,
-                env: proc.environment,
-                url: 'api/?urls.primaryName='+pl.name+'%20-%20MEC%20Service%20Management%20API',
-                path: pl.name+'/fed_enablement/v1',
-                pseudoName: 'MEC Federation (040) on ' + pl.name,
-                dropDownName: 'MEC Federation (011)',
-                enabled: true,  // always running
-                enableInProgressCount: -1,
-                disableInProgressCount: -1
-              });
-            }
+              } else if (proc.image.includes('meep-federation')) {
+                edgeApps.push({
+                  id: proc.id,
+                  name: proc.name,
+                  instance: '',
+                  img: proc.image,
+                  mepName: pl.name,
+                  env: proc.environment,
+                  url: 'api/?urls.primaryName='+pl.name+'%20-%20Federation%20Service%20REST%20API',
+                  path: pl.name+'/fed_enablement/v1',
+                  pseudoName: 'MEC Federation APIs (040) on ' + pl.name,
+                  dropDownName: 'MEC Federation APIs (040)',
+                  enabled: false,
+                  enableInProgressCount: -1,
+                  disableInProgressCount: -1
+                });
+              }
             }
           }
         }
-- 
GitLab