Epankou/bug flow deactivation ewc 293

src/cli/microservice.js

@@ -242,19 +242,19 @@ class Microservice extends BaseCLIHandler {
             example: '$ iofog-controller microservice add [other required options] --routes ABC:DEF RFG:HJK'
           },
           {
-            desc: '4. Add route (ABC:DEF - source microservice id : dest microservice id)',
+            desc: '5. Add route (ABC:DEF - source microservice id : dest microservice id)',
             example: '$ iofog-controller microservice route-create --route ABC:DEF',
           },
           {
-            desc: '5. Delete route (ABC:DEF - source microservice id : dest microservice id)',
+            desc: '6. Delete route (ABC:DEF - source microservice id : dest microservice id)',
             example: '$ iofog-controller microservice route-remove --route ABC:DEF',
           },
           {
-            desc: '6. Create port mapping (80:8080:false - internal port : external port : public mode, ABC - microservice)',
+            desc: '7. Create port mapping (80:8080:false - internal port : external port : public mode, ABC - microservice)',
             example: '$ iofog-controller microservice port-mapping-create --mapping 80:8080:false -i ABC'
           },
           {
-            desc: '7. Delete port mapping (80 - internal port, ABC - microservice id)',
+            desc: '8. Delete port mapping (80 - internal port, ABC - microservice id)',
             example: '$ iofog-controller microservice port-mapping-remove --internal-port 80 -i ABC'
           }
         ],

src/schemas/catalog.js

@@ -33,7 +33,7 @@ const catalogItemCreate = {
     "inputType": {"$ref": "/type"},
     "outputType": {"$ref": "/type"}
   },
-  "required": ["name"],
+  "required": ["name", "registryId", "images"],
   "additionalProperties": false
 };
 

src/sequelize/managers/flow-manager.js

@@ -27,7 +27,7 @@ class FlowManager extends BaseManager {
       include: [
         {
           model: Microservice,
-          as: 'microservice',
+          as: 'microservices',
           required: false,
           attributes: ['iofogUuid']
         }

src/sequelize/managers/microservice-manager.js

@@ -23,6 +23,7 @@ const Fog = models.Fog;
 const Flow = models.Flow;
 const User = models.User;
 const Routing = models.Routing;
+const Registry = models.Registry;
 
 class MicroserviceManager extends BaseManager {
   getEntity() {
@@ -53,7 +54,7 @@ class MicroserviceManager extends BaseManager {
       {
         model: CatalogItem,
         as: 'catalogItem',
-        required: false,
+        required: true,
         include: [{
           model: CatalogItemImage,
           as: 'images',
@@ -86,6 +87,55 @@ class MicroserviceManager extends BaseManager {
     }, {transaction: transaction})
   }
 
+  findAllActiveFlowMicroservices(iofogUuid, transaction) {
+    return Microservice.findAll({
+      include: [
+        {
+          model: MicroservicePort,
+          as: 'ports',
+          required: false,
+          attributes: ['portInternal', 'portExternal']
+        },
+        {
+          model: VolumeMapping,
+          as: 'volumeMappings',
+          required: false,
+          attributes: ['hostDestination', 'containerDestination', 'accessMode']
+        },
+        {
+          model: CatalogItem,
+          as: 'catalogItem',
+          required: true,
+          include: [
+            {
+              model: CatalogItemImage,
+              as: 'images',
+              required: true,
+              attributes: ['containerImage', 'fogTypeId']
+            },
+            {
+              model: Registry,
+              as: 'registry',
+              required: true,
+              attributes: ['url']
+            }
+          ],
+          attributes: ['picture']
+        },
+        {
+          model: Flow,
+          as: 'flow',
+          required: true,
+          attributes: ['isActivated']
+        }
+      ],
+      where: {
+        iofogUuid: iofogUuid,
+        '$flow.is_activated$': true
+      }
+    }, {transaction: transaction})
+  }
+
   findOneWithDependencies(where, attributes, transaction) {
     return Microservice.findOne({
       include: [

src/sequelize/models/flow.js

@@ -53,7 +53,7 @@ module.exports = (sequelize, DataTypes) => {
         name: 'flowId',
         field: 'flow_id'
       },
-      as: 'microservice'
+      as: 'microservices'
     })
   };
   return Flow;

src/services/agent-service.js

@@ -207,28 +207,15 @@ const updateAgentStatus = async function (agentStatus, fog, transaction) {
 };
 
 const getAgentMicroservices = async function (fog, transaction) {
-  const microservices = await MicroserviceManager.findAllWithDependencies({
-    iofogUuid: fog.uuid
-  }, {}, transaction);
+  const microservices = await MicroserviceManager.findAllActiveFlowMicroservices(fog.uuid, transaction);
 
   const fogTypeId = fog.fogTypeId;
 
   const response = [];
-  for (const microservice of microservices) {
-    let imageId = '';
+  for (let microservice of microservices) {
     const images = microservice.catalogItem.images;
-    for (const image of images) {
-      if (image.fogTypeId === fogTypeId) {
-        imageId = image.containerImage;
-        break;
-      }
-    }
-
-    const registry = await RegistryManager.findOne({
-      id: microservice.catalogItem.registryId
-    }, transaction);
-
-    const registryUrl = registry.url;
+    const image = images.find(image => image.fogTypeId === fogTypeId);
+    const imageId = image ? image.containerImage : '';
 
     const routes = await MicroserviceService.getPhysicalConections(microservice, transaction);
 
@@ -239,7 +226,7 @@ const getAgentMicroservices = async function (fog, transaction) {
       rebuild: microservice.rebuild,
       rootHostAccess: microservice.rootHostAccess,
       logSize: microservice.logSize,
-      registryUrl: registryUrl,
+      registryUrl: microservice.catalogItem.registry.url,
       portMappings: microservice.ports,
       volumeMappings: microservice.volumeMappings,
       imageSnapshot: microservice.imageSnapshot,
@@ -418,7 +405,7 @@ async function _checkMicroservicesFogType(fog, fogTypeId, transaction) {
 
     for (const microservice of microservices) {
       let exists = false;
-      for (const image of microservice.catalogItem.images) {
+      for (let image of microservice.catalogItem.images) {
         if (image.fogTypeId === fogTypeId) {
           exists = true;
           break;

src/services/flow-service.js

@@ -22,7 +22,6 @@ const ChangeTrackingManager = require('../sequelize/managers/change-tracking-man
 const _createFlow = async function (flowData, user, isCLI, transaction) {
   await Validation.validate(flowData, Validation.schemas.flowCreate);
 
-  await isFlowExist(flowData.name, transaction);
   await _checkForDuplicateName(flowData.name, {}, transaction);
 
   const flowToCreate = {
@@ -84,7 +83,7 @@ const _updateFlow = async function (flowData, flowId, user, isCLI, transaction)
   if (oldFlow.isActivated !== flowData.isActivated) {
     const flowWithMicroservices = await FlowManager.findFlowMicroservices({id: flowId}, transaction);
     const onlyUnique = (value, index, self) => self.indexOf(value) === index;
-    const iofogUuids = flowWithMicroservices.microservice
+    const iofogUuids = flowWithMicroservices.microservices
       .map(obj => obj.iofogUuid)
       .filter(onlyUnique)
       .filter(val => val !== null);