Commit 1e79a8a2 authored by Simon Pastor's avatar Simon Pastor
Browse files

uniqueness double checked

parent e27aa9ad

js-apps/meep-frontend/src/js/containers/cfg/cfg-page-container.js

+3 −3
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ class CfgPageContainer extends Component { 
          if (zone.name.indexOf(COMMON_ZONE_TYPE_STR) !== -1) {

            newNlRootParentName = newZoneRootParentName + COMMON_ZONE_TYPE_STR;

          } else {

            elementFromScenario = getElementFromScenario(scenario, zone.name);

            elementFromScenario = getElementFromScenario(scenario, zone.id);

            newNlRootParentName = this.cloneElement(elementFromScenario, newZoneRootParentName, false);

          }

        } else {
@@ -223,7 +223,7 @@ class CfgPageContainer extends Component { 
            if (nl.name.indexOf(DEFAULT_NL_TYPE_STR) !== -1) {

              newPlRootParentName = newNlRootParentName;

            } else {

              elementFromScenario = getElementFromScenario(scenario, nl.name);

              elementFromScenario = getElementFromScenario(scenario, nl.id);

              newPlRootParentName = this.cloneElement(elementFromScenario, newNlRootParentName, false);

            }

          } else {
@@ -238,7 +238,7 @@ class CfgPageContainer extends Component { 
            var pl = nl.physicalLocations[l];



            if (inCloneBranch) {

              elementFromScenario = getElementFromScenario(scenario, pl.name);

              elementFromScenario = getElementFromScenario(scenario, pl.id);

              newProcessRootParentName = this.cloneElement(elementFromScenario, newPlRootParentName, false);

            } else {

              if (pl.id === element.id) {

js-apps/meep-frontend/src/js/util/scenario-utils.js

+65 −1
Original line number Diff line number Diff line
@@ -237,12 +237,76 @@ export function parseScenario(scenario) { 
  return { table: table, visData: visData };

}



function findIdInScenario(scenario, uniqueId) {



  // Domains

  for (var i in scenario.deployment.domains) {

    var domain = scenario.deployment.domains[i];



    // Add domain to graph and table (ignore public domain)

    if (domain.id === uniqueId) {

      return true;

    }



    // Zones

    for (var j in domain.zones) {

      var zone = domain.zones[j];



      if (zone.id === uniqueId) {

        return true;

      }



      // Network Locations

      for (var k in zone.networkLocations) {

        var nl = zone.networkLocations[k];



        if (nl.id === uniqueId) {

          return true;

        }



        // Physical Locations

        for (var l in nl.physicalLocations) {

          var pl = nl.physicalLocations[l];



          if (pl.id === uniqueId) {

            return true;

          }



          // Processes

          for (var m in pl.processes) {

            var proc = pl.processes[m];



            if (proc.id === uniqueId) {

              return true;

            }

          }

        }

      }

    }

  }

  return false;

}





function getUniqueId(scenario) {

  var uniqueId = uuid();

  var isUniqueId = false;

  while(!isUniqueId) {

    isUniqueId = true;

    if (findIdInScenario(scenario, uniqueId)) {

      uniqueId = uuid();

      isUniqueId = false;

    }

  }

  return uniqueId;

}



// Add network element to scenario

export function addElementToScenario(scenario, element) {

  var scenarioElement;

  var type = getElemFieldVal(element, FIELD_TYPE);

  var name = getElemFieldVal(element, FIELD_NAME);

  var uniqueId = uuid();

  var uniqueId = getUniqueId(scenario);



  var parent = getElemFieldVal(element, FIELD_PARENT);