Unverified Commit e9411504 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #101 from dilallkx/kd_sp25_dev_ansible 

Kd sp25 dev ansible
parents 342c093c 25387e63

js-apps/meep-frontend/src/js/containers/idc-map.js

+8 −1
Original line number Diff line number Diff line
@@ -215,6 +215,11 @@ class IDCMap extends Component { 
    var zoom = (cfg && cfg.zoom) ? cfg.zoom : DEFAULT_MAP_ZOOM;

    var baselayerName = (cfg && cfg.baselayerName) ? cfg.baselayerName : DEFAULT_MAP_STYLE;

 

    // Map bounds

    const corner1 = L.latLng(-90, -180);

    const corner2 = L.latLng(90, 180);

    const bounds = L.latLngBounds(corner1, corner2);

    

    // Create Map instance

    var domNode = ReactDOM.findDOMNode(this);

    this.map = L.map(domNode, {
@@ -222,7 +227,9 @@ class IDCMap extends Component { 
      zoom: zoom,

      minZoom: 2,

      maxZoom: 20,

      drawControl: true

      drawControl: true,

      maxBounds: bounds,

      maxBoundsViscosity: 1.0

    });

    this.map.attributionControl.addAttribution('<a href="https://www.maptiler.com/copyright/?_ga=2.45788834.742970109.1593090041-1523068243.1593090041" target="_blank">© MapTiler</a>');

    this.map.attributionControl.addAttribution('<a href="https://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap contributors</a>');

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

+50 −34
Original line number Diff line number Diff line
@@ -467,27 +467,33 @@ export function updateElementInScenario(scenario, element) { 


  // Find element in scenario

  if (scenario.name === name) {

    if (scenario.deployment.netChar) {



    if (!scenario.deployment.netChar) {

      scenario.deployment.netChar = {};

    }

    scenario.deployment.netChar.latency = getElemFieldVal(element, FIELD_INT_DOM_LATENCY);

    scenario.deployment.netChar.latencyVariation = getElemFieldVal(element, FIELD_INT_DOM_LATENCY_VAR);

    scenario.deployment.netChar.latencyDistribution = getElemFieldVal(element, FIELD_INT_DOM_LATENCY_DIST);

    scenario.deployment.netChar.throughputDl = getElemFieldVal(element, FIELD_INT_DOM_THROUGHPUT_DL);

    scenario.deployment.netChar.throughputUl = getElemFieldVal(element, FIELD_INT_DOM_THROUGHPUT_UL);

    scenario.deployment.netChar.packetLoss = getElemFieldVal(element, FIELD_INT_DOM_PKT_LOSS);

    }



    return;

  }



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

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

    if (domain.id === id) {

      if (domain.netChar) {



      if (!domain.netChar) {

        domain.netChar = {};

      }

      domain.netChar.latency = getElemFieldVal(element, FIELD_INT_ZONE_LATENCY);

      domain.netChar.latencyVariation = getElemFieldVal(element, FIELD_INT_ZONE_LATENCY_VAR);

      domain.netChar.throughputDl = getElemFieldVal(element, FIELD_INT_ZONE_THROUGHPUT_DL);

      domain.netChar.throughputUl = getElemFieldVal(element, FIELD_INT_ZONE_THROUGHPUT_UL);

      domain.netChar.packetLoss = getElemFieldVal(element, FIELD_INT_ZONE_PKT_LOSS);

      }



      if (domain.type === DOMAIN_CELL_TYPE_STR) {

        var cellularDomainConfig = {

          mcc: getElemFieldVal(element, FIELD_MCC),
@@ -522,13 +528,15 @@ export function updateElementInScenario(scenario, element) { 
    for (var j in domain.zones) {

      var zone = domain.zones[j];

      if (zone.id === id) {

        if (zone.netChar) {



        if (!zone.netChar) {

          zone.netChar = {};

        }

        zone.netChar.latency = getElemFieldVal(element, FIELD_INTRA_ZONE_LATENCY);

        zone.netChar.latencyVariation = getElemFieldVal(element, FIELD_INTRA_ZONE_LATENCY_VAR);

        zone.netChar.throughputDl = getElemFieldVal(element, FIELD_INTRA_ZONE_THROUGHPUT_DL);

        zone.netChar.throughputUl = getElemFieldVal(element, FIELD_INTRA_ZONE_THROUGHPUT_UL);

        zone.netChar.packetLoss = getElemFieldVal(element, FIELD_INTRA_ZONE_PKT_LOSS);

        }



        //if zone name changed, other elements created based on that name must also be updated (default ones)

        for (var j2 in zone.networkLocations) {
@@ -547,13 +555,16 @@ export function updateElementInScenario(scenario, element) { 
      for (var k in zone.networkLocations) {

        var nl = zone.networkLocations[k];

        if (nl.id === id) {

          if (nl.netChar) {



          if (!nl.netChar) {

            nl.netChar = {};

          }

          nl.netChar.latency = getElemFieldVal(element, FIELD_TERM_LINK_LATENCY);

          nl.netChar.latencyVariation = getElemFieldVal(element, FIELD_TERM_LINK_LATENCY_VAR);

          nl.netChar.throughputDl = getElemFieldVal(element, FIELD_TERM_LINK_THROUGHPUT_DL);

          nl.netChar.throughputUl = getElemFieldVal(element, FIELD_TERM_LINK_THROUGHPUT_UL);

          nl.netChar.packetLoss = getElemFieldVal(element, FIELD_TERM_LINK_PKT_LOSS);

          }



          if (nl.type === POA_CELL_TYPE_STR) {

            var cellularPoaConfig = {

              cellId: getElemFieldVal(element, FIELD_CELL_ID)
@@ -569,7 +580,8 @@ export function updateElementInScenario(scenario, element) { 
            type: 'Point',

            coordinates: JSON.parse(nlLocation)

          };

          nl.geoData.radius = getElemFieldVal(element, FIELD_GEO_RADIUS);

          var radius = getElemFieldVal(element, FIELD_GEO_RADIUS);

          nl.geoData.radius = (radius === '') ? null : radius;



          nl.label = name;

          nl.name = name;
@@ -579,13 +591,15 @@ export function updateElementInScenario(scenario, element) { 
        for (var l in nl.physicalLocations) {

          var pl = nl.physicalLocations[l];

          if (pl.id === id) {

            if (pl.netChar) {



            if (!pl.netChar) {

              pl.netChar = {};

            }

            pl.netChar.latency = getElemFieldVal(element, FIELD_LINK_LATENCY);

            pl.netChar.latencyVariation = getElemFieldVal(element, FIELD_LINK_LATENCY_VAR);

            pl.netChar.throughputDl = getElemFieldVal(element, FIELD_LINK_THROUGHPUT_DL);

            pl.netChar.throughputUl = getElemFieldVal(element, FIELD_LINK_THROUGHPUT_UL);

            pl.netChar.packetLoss = getElemFieldVal(element, FIELD_LINK_PKT_LOSS);

            }



            if (!pl.geoData) {

              pl.geoData = {};
@@ -1049,6 +1063,7 @@ export function createDefaultDomain() { 


export function createPoa(uniqueId, name, element) {

  var location = getElemFieldVal(element, FIELD_GEO_LOCATION);

  var radius = getElemFieldVal(element, FIELD_GEO_RADIUS);

  var nl = {

    id: uniqueId,

    name: name,
@@ -1065,7 +1080,7 @@ export function createPoa(uniqueId, name, element) { 
        type: 'Point',

        coordinates: JSON.parse(location)

      },

      radius: getElemFieldVal(element, FIELD_GEO_RADIUS)

      radius: (radius === '') ? null : radius

    },

    physicalLocations: []

  };
@@ -1075,6 +1090,7 @@ export function createPoa(uniqueId, name, element) { 


export function createPoaCell(uniqueId, name, element) {

  var location = getElemFieldVal(element, FIELD_GEO_LOCATION);

  var radius = getElemFieldVal(element, FIELD_GEO_RADIUS);

  var nl = {

    id: uniqueId,

    name: name,
@@ -1095,7 +1111,7 @@ export function createPoaCell(uniqueId, name, element) { 
        type: 'Point',

        coordinates: JSON.parse(location)

      },

      radius: getElemFieldVal(element, FIELD_GEO_RADIUS)

      radius: (radius === '') ? null : radius

    }

  };

playbooks/README.md

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# AdvantEDGE Playbooks



This folder contains AdvantEDGE ansible playbooks.
 
 No newline at end of file

playbooks/ansible.cfg

0 → 100644
+14 −0
Original line number Diff line number Diff line 
[defaults]

roles_path = ./roles

inventory  = ./hosts.ini

remote_tmp = $HOME/.ansible/tmp

local_tmp  = $HOME/.ansible/tmp

pipelining = True

host_key_checking = False

deprecation_warnings = False

callback_whitelist = profile_tasks

ask_pass = True



[privilege_escalation]

become = True

become_ask_pass = True

playbooks/group_vars/all.yml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
---



# Ansible

# ansible_user: root

ansible_python_interpreter: /usr/bin/python3



# Docker

docker_version: "5:19.03"



# Kubernetes

kube_version: "1.15"

cni_version: "0.7.5"

master_ip: "{{ hostvars[groups['master'][0]]['ansible_default_ipv4'].address | default(groups['master'][0]) }}"

network_dir: /etc/kubernetes/network

kubeadmin_config: /etc/kubernetes/admin.conf



# Helm

helm_version: "2.16/stable"



# Go

#go_version: "1.13.12"

#golangci_lint_version: "v1.18.0"
 
 No newline at end of file