topologygenerator 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aebf02d9e22bc33b8e03d2e2f01e3ace4688921b
-  data.tar.gz: 900b820d45f14d763911c2f7327989f04e80c390
+  metadata.gz: f6079c6feadcbc819158e4425af26a579aa82f7b
+  data.tar.gz: e80790da8c02b2916641529e03a418da66215b24
 SHA512:
-  metadata.gz: 220e81ed264452e49adbbea34119c16d938a6a21518d545785044784637e10156c37cffefa7a36f21a0cfbe32c60a8d1adf040a9750e7345902e2f7a80e469a3
-  data.tar.gz: 54f68692e12491fd4f8e5ab19289be0859917ca3e576793ef9a8d1e41565aa281c977a44507635d834f43b4d0ce5aa2d9b0b2a64f03fa973a3b137b08c9e1db6
+  metadata.gz: 0587b090cec4763a4a1bb032e0140d20e3c08f96cee444575fdf8c44a2660e55e3371c5ea8fad19ad253cb0d9c589a3f750abe2b30649ea1e3bfb48ae230cb77
+  data.tar.gz: 54ea307fe7cdd2913c63d2546c22d7119421ed8d790001e0856def12146a9735021d6a18ac0b85b33dc406e28b42fc8b04d0743176fbb8fe983bd9088ff45e06

data/README.md

@@ -30,6 +30,8 @@ https://github.com/andyLaurito92/haikunet
 
 ## Installation
 
+### As a gem
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -44,6 +46,14 @@ Or install it yourself as:
 
     $ gem install topologygenerator
 
+### As a binary
+
+Run the following command in your command line
+
+```bash
+\curl -sSL https://raw.githubusercontent.com/andyLaurito92/topologygenerator/master/install_topologygenerator.sh | bash
+```
+
 ## Usage
 
 For using the topologygenerator gem, you will need to write your output builder, and specify the uri from where the initial topology information will be get. 

data/install_topologygenerator.sh

@@ -0,0 +1,19 @@
+#!/bin/bah
+
+WGET_INSTALLED=$(which wget)
+if [ -z "${WGET_INSTALLED// }" ]
+ then
+ 	apt-get install wget
+fi
+
+wget -L https://github.com/andyLaurito92/topologygenerator/archive/master.tar.gz ; mkdir -p topologygenerator && tar xf master.tar.gz -C topologygenerator --strip-components=1
+rm master.tar.gz
+rm master.tar.gz.1
+
+cd topologygenerator
+
+#Add directory to $PATH
+TOPOLOGYGENERATOR_DIRECTORY=$(pwd)
+echo "export PATH=\"$PATH:$TOPOLOGYGENERATOR_DIRECTORY/lib\" # Adding Topologygenerator's directory to your PATH variable" >> ~/.bashrc
+
+source ~/.bashrc

data/lib/{createTopology.rb → Topologygenerator}

@@ -4,7 +4,7 @@ require_relative 'command_line/command_line_arguments.rb'
 require_relative "topologygenerator.rb"
 require 'colorize'
 
-#begin
+begin
     my_command_line_arguments = CommandLineArguments.new
     my_command_line_arguments.run
 
@@ -15,7 +15,7 @@ require 'colorize'
             "uri_resource" => my_command_line_arguments.uri_resource
         })
     topo_gen.generate
-#rescue Exception => ex
-#  puts "#{ex.class}".red 
-#  puts "#{ex.message}".blue
-#end
+rescue Exception => ex
+  puts "#{ex.class}".red 
+  puts "#{ex.message}".blue
+end

data/lib/builders_examples/pdm_builders/PhaseIWithPriorityQueues/Flow_concrete_builder.rb

@@ -8,8 +8,8 @@ module FlowConcreteBuilder
     def build_scilab_definition
         scilab_flows_definition = ''
         scilab_flows_definition += "\n"
-        scilab_flows_definition += build_parameter_flow_distribution 'periodDistribution', distribution_rate
-        scilab_flows_definition += build_parameter_flow_distribution 'packetSizeDistribution', distribution_size
+        scilab_flows_definition += build_parameter_flow_distribution 'period', distribution_rate
+        scilab_flows_definition += build_parameter_flow_distribution 'packetSize', distribution_size
         scilab_flows_definition
     end
 
@@ -35,20 +35,51 @@ module FlowConcreteBuilder
             scilab_flow_parameter_distribution = "flow#{@id}.#{distribution_name} =  DISTRIBUTION_SPLIT;\n"
             scilab_flow_parameter_distribution += "flow#{@id}.#{distribution_name}_shape = #{distribution_variable.shape}; \n"
             scilab_flow_parameter_distribution += "flow#{@id}.#{distribution_name}_scale = #{distribution_variable.scale}; \n"
+        when FelixDistribution             
+            scilab_flow_parameter_distribution = "flow#{@id}.#{distribution_name} =  DISTRIBUTION_FELIX;\n"             
+            scilab_flow_parameter_distribution += get_string_parameters_from (build_parameter_flow_distribution '', distribution_variable.period), "flow#{@id}.#{distribution_name}_period"             
+            scilab_flow_parameter_distribution += "flow#{@id}.#{distribution_name}_mode = #{distribution_variable.mode}; \n"             
+            if distribution_variable.mode == FelixDistribution::FELIX_MODE_HIGH_THROUGHOUT      
+                scilab_flow_parameter_distribution += get_string_parameters_from (build_parameter_flow_distribution '', distribution_variable.size_bytes), "flow#{@id}.#{distribution_name}_size_bytes"                 
+                scilab_flow_parameter_distribution += "flow#{@id}.#{distribution_name}_buffer_bytes = #{distribution_variable.buffer_bytes}; \n"                 
+                scilab_flow_parameter_distribution += "flow#{@id}.#{distribution_name}_timeout = #{distribution_variable.timeout}; \n"                 
+                scilab_flow_parameter_distribution += "flow#{@id}.#{distribution_name}_out_size_bytes = #{distribution_variable.out_size_bytes}; \n"             
+            end
         else
             raise "Distribution provided has a class which was unexpected. Class was: #{distribution_variable.class}"
         end
         scilab_flow_parameter_distribution
     end
 
+    def get_string_parameters_from(flow_definition_string, name_of_flow)         
+        output = ''         
+        flow_definition_lines = flow_definition_string.split "\n"         
+        distribution_line = flow_definition_lines.shift         
+        distribution_name = (distribution_line.split "=").last.gsub /\s+/, ""         
+        distribution_name.gsub! ';', ''         
+        output += "#{name_of_flow} = #{distribution_name};\n"         
+        flow_definition_lines.each do |flow_definition_line|             
+            flow_definition_line.gsub( /\s+/, "" )             
+            flow_definition_line.gsub! 'flow.', ''             
+            flow_definition_line.gsub! '\n', ''             
+            flow_definition_line.gsub! '_', ''             
+            flow_definition_line.gsub! ';', ''
+            flow_definition_line.gsub! /\/\/.*/,'' #Remove comment from line             
+            key_and_value = flow_definition_line.split '='             
+            key_and_value.first.gsub! /.*\./, ''             
+            output += "#{name_of_flow}_#{key_and_value.first} = #{key_and_value.last};\n"         
+        end         
+        output     
+    end
+
     def build_cplusplus_definition
         start_time_of_flow = 0
         # flow
         cplusplus_flows_definition = "\n"
         cplusplus_flows_definition += "\t ///// definition of flow #{@id} \n"
-        cplusplus_flows_definition += "\t auto flow#{@id}PeriodDistribution = readDistributionParameter(\"flow#{@id}.periodDistribution\"); \n"
-        cplusplus_flows_definition += "\t auto flow#{@id}PacketSizeDistribution = readDistributionParameter(\"flow#{@id}.packetSizeDistribution\"); \n"
-        cplusplus_flows_definition += "\t auto flow#{@id} = std::make_shared<Flow>(\"#{@id}\", #{start_time_of_flow} /*startTime*/, #{priority} /*typeOfService*/, flow#{@id}PeriodDistribution, flow#{@id}PacketSizeDistribution); \n"
+        cplusplus_flows_definition += "\t auto flow#{@id}Period = readDistributionParameter(\"flow#{@id}.period\"); \n"
+        cplusplus_flows_definition += "\t auto flow#{@id}PacketSize = readDistributionParameter(\"flow#{@id}.packetSize\"); \n"
+        cplusplus_flows_definition += "\t auto flow#{@id} = std::make_shared<Flow>(\"#{@id}\", #{start_time_of_flow} /*startTime*/, #{priority} /*typeOfService*/, flow#{@id}Period, flow#{@id}PacketSize); \n"
                
         #routes
         cplusplus_flows_definition += "\t // routes for flow #{@id} \n"

data/lib/builders_examples/pdm_builders/PhaseIWithPriorityQueues/output_concrete_builder.rb

@@ -148,7 +148,7 @@ module OutputConcreteBuilder
                           }
                       Parameters
                           {
-                          Run at Init = Str; exec('#{File.absolute_path(@output_directory)}/Scilab/model.scilabParams', 0) ; Scilab Job at Init
+                          Run at Init = Str; exec('../examples/PhaseI_topologies/lar_with_hlt/model.scilabParams', 0) ; Scilab Job at Init
                           Run at External = Str;  ; Scilab Job when receive event
                           Run at Exit = Str;  ; Scilab Job at Exit
                           }
@@ -216,9 +216,9 @@ module OutputConcreteBuilder
                           }
                       Parameters
                           {
-                          initSimulationCommandName = Str; #{File.absolute_path(@output_directory)}/Scilab/firstSimulation.sce ; 
-                          eachSimulationCommandName = Str; #{File.absolute_path(@output_directory)}/Scilab/eachSimulation.sce ; 
-                          lastSimulationCommandName = Str; #{File.absolute_path(@output_directory)}/Scilab/lastSimulation.sce ; 
+                          initSimulationCommandName = Str; ../examples/PhaseI_topologies/lar_with_hlt/firstSimulation.sce ; 
+                          eachSimulationCommandName = Str; ../examples/PhaseI_topologies/lar_with_hlt/eachSimulation.sce ; 
+                          lastSimulationCommandName = Str; ../examples/PhaseI_topologies/lar_with_hlt/lastSimulation.sce ; 
                           }
                       }
                   }

data/lib/command_line/command_line_arguments.rb

@@ -10,22 +10,22 @@ class CommandLineArguments
     def run
         program :name, 'Create PowerDevs topology'
         program :version, '0.0.1'
-        program :description, 'Script for creating PowerDevs topology. The output will be a .pdm file'
+        program :description, 'Tool for retrieving topologies from a specific target and serialize it into a specific output format'
         program :help, 'Author', 'Andrés Laurito && Matias Bonaventura'
 
         my_command_line_argument = self 
 
         my_command = command :source do |c|
-          c.syntax = 'createTopology source [OPTIONS]'
-          c.summary = 'Specify data source for retrieving the topology'
+          c.syntax = 'Topologygenerator source [OPTIONS]'
+          c.summary = 'Specify the name of the source from where to retrieve the topology, the output directory, 
+          the URI used to get the topology and the directory of where the builders are located.'
           c.description = 'Specify the data source from where the topology should be retrieved
-        An example of use: createTopology source ONOS
-        By default, the option is set in CUSTOM.
-        You can also set the output file with the -f option. For example, createTopology source ONOS -f topology
-        By default, the output will be written in a file called my_topology'
-          c.example 'Set ONOS as source', 'createTopology source -n ONOS'
-          c.example 'Set CUSTOM as source', 'createTopology source -n CUSTOM'
-          c.example 'Set CUSTOM as source and called the output file my_file', 'createTopology source -n MOCK -f my_file'
+          An example of use: Topologygenerator source -n ONOS -o output -u http://127.0.0.1:8181/onos/v1/ -d builders_examples/ruby_builders
+          By default, the option is set in CUSTOM.
+          By default, the output will be written in a file called my_topology'
+          c.example 'Set ONOS as source', 'Topologygenerator source -n ONOS'
+          c.example 'Set CUSTOM as source', 'Topologygenerator source -n CUSTOM'
+          c.example 'Set CUSTOM as source and called the output file my_file', 'Topologygenerator source -n MOCK -o my_file.txt'
           c.option '-n', '--name NAME', String, 'Specify the source name'
           c.option '-o', '--outDir NAME', String, 'Specify the output directory path'
           c.option '-u', '--uri NAME', String, 'Specify the uri for the source'

data/lib/flows_distributions/felix_distribution.rb

@@ -0,0 +1,17 @@
+require_relative 'normal_distribution.rb'
+
+class FelixDistribution
+    FELIX_MODE_HIGH_THROUGHOUT = "FELIX_MODE_HIGH_THROUGHOUT"
+    FELIX_MODE_LOW_LATENCY = "FELIX_MODE_LOW_LATENCY"
+  
+    attr_reader :period, :mode, :size_bytes, :buffer_bytes, :timeout, :out_size_bytes
+    
+    def initialize(period, mode, size_bytes = nil, buffer_bytes = nil, timeout = nil, out_size_bytes = nil)
+        @period = period #its the distribution of the message period arriving at the GBT link 
+        @mode = mode #Its either FELIX_MODE_LOW_LATENCY or FELIX_MODE_HIGH_THROUGHPUT
+        @size_bytes = size_bytes || (NormalDistribution.new "4*k", "1*k") #Its a distribution of the message size arriving at the GBT link
+        @buffer_bytes = buffer_bytes || "1 * M"
+        @timeout = timeout || 1
+        @out_size_bytes = out_size_bytes || "TCP_MTU_bytes"
+    end
+end

data/lib/network_entities/abstracts/flow.rb

@@ -4,6 +4,7 @@ require_relative '../../flows_distributions/exponential_distribution.rb'
 require_relative '../../flows_distributions/normal_distribution.rb'
 require_relative '../../flows_distributions/pareto_distribution.rb'
 require_relative '../../flows_distributions/split_distribution.rb'
+require_relative '../../flows_distributions/felix_distribution.rb'
 
 class Flow
     include SerializeBehavior
@@ -15,8 +16,8 @@ class Flow
         raise "Invalid 'paths' argument received. 'paths' must be an instance of Arry class, however the path received has class #{paths.class}" unless paths.is_a? Array
         raise "Invalid 'distribution_rate' received. Distribution rate cannot be nil" unless distribution_rate
         raise "Invalid 'distribution_size' received. Distribution size cannot be nil" unless distribution_size
-        raise "Invalid 'distribution_rate' #{distribution_rate}. It is expected that the rate is an instance of a distribution" unless [ConstantDistribution, ExponentialDistribution, NormalDistribution, ParetoDistribution, SplitDistribution].include? distribution_rate.class
-        raise "Invalid 'distribution_size' #{distribution_size}. It is expected that the size is an instance of a distribution" unless [ConstantDistribution, ExponentialDistribution, NormalDistribution, ParetoDistribution, SplitDistribution].include? distribution_size.class
+        raise "Invalid 'distribution_rate' #{distribution_rate}. It is expected that the rate is an instance of a distribution" unless [ConstantDistribution, ExponentialDistribution, NormalDistribution, ParetoDistribution, SplitDistribution, FelixDistribution].include? distribution_rate.class
+        raise "Invalid 'distribution_size' #{distribution_size}. It is expected that the size is an instance of a distribution" unless [ConstantDistribution, ExponentialDistribution, NormalDistribution, ParetoDistribution, SplitDistribution, FelixDistribution].include? distribution_size.class
 
         @id = id
         @priority = priority

data/lib/network_topologies_examples/PhaseI_LAr_MonitoringHLT.rb

@@ -0,0 +1,138 @@
+# topology plotted here: https://docs.google.com/presentation/d/1N5GnG82JvsASUJ6sl-gmuMBRjMWG6OWtybIjOMikb-M/edit#slide=id.p
+
+module NetworkTopology 
+    # constants
+    K = 1000  # Kilo=10³
+    M = 1000 * K  # Megas=10⁶
+    G = 1000 * M  # Megas=10⁶
+    
+    TCP_MTU_bytes = 1500 # (in bytes)
+    
+    # parameters
+    NUMBER_OF_FELIX_SERVERS = 13 # this generates 1:1 connections with sw_rod, so NUMBER_OF_FELIX_SERVERS=numberOfSWRODServers
+    #NUMBER_OF_FELIX_SERVERS = 3 # this generates 1:1 connections with sw_rod, so NUMBER_OF_FELIX_SERVERS=numberOfSWRODServers
+    NUMBER_OF_MONITORING_SERVERS = 5
+    LINK_BW_40G_BITS_S =   40  * G # 40 Gbps
+    LINK_BW_10G_BITS_S =   1  * G # 10 Gbps
+    FELIX_FLOW_PRIORITY = 0    
+    FELIX_GBT_ELINKS = 10 # #GBT e-links in each felix server. There will be one flow created per e-link (because there will be 1 thread, one connection per e-link)
+    
+    # felix data-flow distributions (one per GBT)
+    FELIX_GBT_PERIOD_sec = ExponentialDistribution.new 1.0 / (100*K) # distribution period in seconds
+    #FELIX_GBT_PERIOD_sec = ExponentialDistribution.new 1.0 / (100) #TODO: this is just for testing quick simulations. Normal rate should be 100*k
+    FELIX_GBT_SIZE_bytes = NormalDistribution.new 4.0*K, 1.0*K  # (in bytes)
+    FELIX_GBT_BUFFER_bytes = 1*M  # (in bytes)
+    FELIX_GBT_TIME_OUT_sec = 2  # (in seconds)
+    FELIX_GBT_OUT_SIZE_bytes =  TCP_MTU_bytes # (in bytes)
+    
+    #FELIX_GENERATION_PERIOD = ExponentialDistribution.new (1.0 * FELIX_GBT_ELINKS) / (70*M)     # distribution period in seconds
+    #FELIX_GENERATION_PERIOD = ExponentialDistribution.new (1.0 * FELIX_GBT_ELINKS) / (1*M)      # distribution period in seconds
+    #FELIX_GENERATION_SIZE = ConstantDistribution.new 1.0*K                                 #distribution size in bits
+    FELIX_GENERATION_PERIOD = FelixDistribution.new FELIX_GBT_PERIOD_sec, 
+                                                    FelixDistribution::FELIX_MODE_HIGH_THROUGHOUT,
+                                                    FELIX_GBT_SIZE_bytes,
+                                                    FELIX_GBT_BUFFER_bytes,
+                                                    FELIX_GBT_TIME_OUT_sec,
+                                                    FELIX_GBT_OUT_SIZE_bytes
+    FELIX_GENERATION_SIZE = ConstantDistribution.new TCP_MTU_bytes*8  #distribution size in bits
+    
+    # monitoring flows (one per GBT)
+    FELIX_MONITORING_PRIORITY = 0
+    MONITORING_SIZE_bits = (TCP_MTU_bytes - 300)*8  
+    TOTAL_MONITORING_PER_SERVER_bits = 0.8 * G
+    MONITORING_GENERATION_PERIOD = ExponentialDistribution.new 1.0 / (TOTAL_MONITORING_PER_SERVER_bits /  (MONITORING_SIZE_bits * FELIX_GBT_ELINKS))
+    MONITORING_GENERATION_SIZE = NormalDistribution.new MONITORING_SIZE_bits, 300*8  #distribution size in bits
+      
+    def get_topology 
+      return @topology.topology_elements if @topology.topology_elements.size != 0 
+      
+      @felix_servers = [] 
+      @sw_rod_servers = []
+      @routers = [] 
+      @links = []
+      @monitoring_servers = []  
+      
+
+      # switches & routers 
+      @routers.push @topology.add_router "lar_switch_01", [1] 
+      @routers.push @topology.add_router "lar_switch_02", [1] 
+      @routers.push @topology.add_router "felix_core_01", [1]  # core_01 router in the felix network (connection out of USA15) 
+      @routers.push @topology.add_router "felix_core_02", [1]  # core_01 router in the felix network (connection out of USA15)
+      @routers.push @topology.add_router "hlt_core_01", [1]  # core_01 router in the HLT network (connection into of SDX1) 
+      @routers.push @topology.add_router "hlt_core_02", [1]  # core_02 router in the HLT network (connection into of SDX1)
+            
+      # Felix servers
+      for i in 0..NUMBER_OF_FELIX_SERVERS-1
+        @felix_servers.push @topology.add_host "lar_felix_#{i}"     
+        
+        # connected to both switches
+        @links.push @topology.add_link "link_felix#{i}_switch1", @felix_servers[i], 0, @routers[0], i+1, LINK_BW_40G_BITS_S  # lar_felix_{i} --> lar_switch_01
+        @links.push @topology.add_link "link_felix#{i}_switch2", @felix_servers[i], 1, @routers[1], i+1, LINK_BW_40G_BITS_S  # lar_felix_{i} --> lar_switch_02
+      end
+      
+      # SWROD servers
+      for i in 0..NUMBER_OF_FELIX_SERVERS-1
+        @sw_rod_servers.push @topology.add_host "lar_swrod_#{i}"     
+        
+        # connected to both switches
+        @links.push @topology.add_link "link_switch1_swrod#{i}", @routers[0], i+1, @sw_rod_servers[i], 0, LINK_BW_40G_BITS_S # lar_switch_01 --> lar_swrod_{i}
+        @links.push @topology.add_link "link_switch2_swrod#{i}", @routers[1], i+1, @sw_rod_servers[i], 1, LINK_BW_40G_BITS_S # lar_switch_02 --> lar_swrod_{i}        
+      end
+      
+      # links between the switches and routers (only 1 link as they will be active-backup: there will be physically 2 links but only one active)
+      @links.push @topology.add_link "link_sw1_core1", @routers[0], 0, @routers[2], 0, LINK_BW_40G_BITS_S  # lar_switch_1 --> lar_core_1
+      @links.push @topology.add_link "link_sw2_core2", @routers[1], 0, @routers[3], 0, LINK_BW_40G_BITS_S  # lar_switch_2 --> lar_core_2      
+      @links.push @topology.add_link "link_core1_hltcore1", @routers[2], 0, @routers[4], 0, LINK_BW_40G_BITS_S  # lar_core_1 --> hlt_core_1
+      @links.push @topology.add_link "link_core2_hltcore2", @routers[3], 0, @routers[5], 0, LINK_BW_40G_BITS_S  # lar_core_2 --> hlt_core_2 
+      
+      # Monitoring servers      
+      for i in 0..NUMBER_OF_MONITORING_SERVERS-1
+        @monitoring_servers.push @topology.add_host "lar_mon_#{i}"     
+        
+        # connected to 1 hlt_core (the other link will be backup (inactive) )       
+        #if i % 2 == 0 then hlt_core_index = 1 else hlt_core_index = 2 end # half the monitoring servers will be connected to one core (hltcore_1), the others will be connected to the other (hltcore_2)
+        #TODO: we add both links, but only 1 will be used (see flow definitions)  
+        @links.push @topology.add_link "link_htlcore1_mon#{i}", @routers[4], i, @monitoring_servers[i], 0, LINK_BW_10G_BITS_S   # hlt_core1 --> mon_{i}
+        @links.push @topology.add_link "link_htlcore2_mon#{i}", @routers[5], i, @monitoring_servers[i], 1, LINK_BW_10G_BITS_S   # hlt_core2 --> mon_{i}
+      end
+      
+           
+      # flow 1Felix:1ROD
+      add_flows_oneFelix_to_oneSWROD
+      
+      print ("finished the topology specification \n")
+      @topology.topology_elements 
+    end 
+    
+    def add_flows_oneFelix_to_oneSWROD
+      # data-flow Flows for each felix server
+      @felix_servers.each_with_index do |felix,index|
+         # NFelix:1mon: A group of N felix servers will always talk with the same mon server. N=#felix/#mon
+         monServer_index = index % NUMBER_OF_MONITORING_SERVERS # first N will all go to different mon. Then, with n+1, it starts again.
+                 
+         # each felix will have 1 data-flow and 1 monitoring-flow per e-link
+         for eLinkIndex in 0..FELIX_GBT_ELINKS-1
+           # Data-Flow path
+           path = Path.new felix, @sw_rod_servers[index]
+           if eLinkIndex % 2 == 0 then switchIndex = 1 else switchIndex = 2 end # half the flows with go one path (switch_1), the other will go the other path (switch_2) 
+           path.add_link @topology.get_element_by_id "link_felix#{index}_switch#{switchIndex}"  # felix{i} -> switch_{1/2}
+           path.add_link @topology.get_element_by_id "link_switch#{switchIndex}_swrod#{index}"  # switch_1 --> lar_swrod{i}
+           
+           @topology.add_flow "Flow#{index}_#{eLinkIndex}", FELIX_FLOW_PRIORITY, [path], FELIX_GENERATION_PERIOD, FELIX_GENERATION_SIZE
+           
+           # Monitoring-flow path will go always to same monServer, but half by switch_1 and half by switch_2
+           path = Path.new felix, @sw_rod_servers[index]            
+           path.add_link @topology.get_element_by_id "link_felix#{index}_switch#{switchIndex}"  # felix{i} -> switch_{1/2}
+           path.add_link @topology.get_element_by_id "link_sw#{switchIndex}_core#{switchIndex}"  # switch_{1/2} --> lar_core{1/2}
+           path.add_link @topology.get_element_by_id "link_core#{switchIndex}_hltcore#{switchIndex}"  # lar_core{1/2} --> hlt_core{1/2}
+           path.add_link @topology.get_element_by_id "link_htlcore#{switchIndex}_mon#{monServer_index}"  # hlt_core{1/2} --> mon{monServer_index}
+                    
+           @topology.add_flow "FlowMon#{index}_#{eLinkIndex}", FELIX_MONITORING_PRIORITY, [path], MONITORING_GENERATION_PERIOD, MONITORING_GENERATION_SIZE
+         end
+     end
+    end
+
+    def get_path_between(source, destination) 
+      raise NotImplementedError, "NetworkTopology: This method is not implemented (¿does it ever get called?)"      
+   end 
+end

data/lib/network_topologies_examples/PhaseI_onlyLAr_1FelixTo1SWROD.rb

@@ -5,7 +5,7 @@ module NetworkTopology
     G = 1000 * M  # Megas=10⁶
     
     # parameters
-    NUMBER_OF_FELIX_SERVERS = 2 # this generates 1:1 connections with sw_rod, so NUMBER_OF_FELIX_SERVERS=numberOfSWRODServers
+    NUMBER_OF_FELIX_SERVERS = 13 # this generates 1:1 connections with sw_rod, so NUMBER_OF_FELIX_SERVERS=numberOfSWRODServers
     LINK_BW_BITS_S =   40  * G # 40 Gbps
     FELIX_GENERATION_PERIOD = ExponentialDistribution.new 1/10.0 # distribution period in seconds
     FELIX_GENERATION_SIZE = ConstantDistribution.new 1.0*K  #distribution size in bits

data/lib/network_topologies_examples/paper_example.rb

@@ -0,0 +1,25 @@
+module NetworkTopology
+ def get_topology
+  return @topology.topology_elements unless @topology.topology_elements.size == 0
+  hosts = []
+  router = @topology.add_router "Router1"
+  for i in 0..2  
+    host = @topology.add_host "Host#{i}"
+    hosts.push host     
+  end
+  bwith = 500*1000*1000
+ @topology.add_full_duplex_link "Link1", hosts[0], 0, router, 0, bwith
+ @topology.add_full_duplex_link "Link2", hosts[1], 0, router, 1, bwith
+ @topology.add_full_duplex_link "Link3", hosts[2], 0, router, 2, bwith
+  link1 = @topology.get_element_by_id "Link1_up"
+  link2 = @topology.get_element_by_id "Link3_down"
+  flow_1_path = Path.new hosts[0], hosts[2]
+  flow_1_path.add_link link1
+  flow_1_path.add_link link2
+  @topology.add_flow "Flow1", 10, 
+  [flow_1_path], 
+  (ExponentialDistribution.new 1.0/6875), 
+  (ConstantDistribution.new 1000*8)
+  @topology.topology_elements
+ end
+end

data/lib/network_topologies_examples/tree_topology.rb

@@ -96,7 +96,7 @@ module NetworkTopology
 
         path = Path.new(source,destination)        
         path.add_link first_link
-        path.add_link second_link
+        path.add_link second_link unless first_link.dst_element == destination
         path
     end
 end

data/lib/providers/apis/opendaylight_topology_provider.rb

@@ -88,7 +88,8 @@ This is who it looks like the xml received by the opendaylight api
         if node['node-id'].include? 'openflow'
           @topology.add_router node['node-id']
         else
-          @topology.add_host node['node-id'], node['ip'], node['mac']
+          node_info = node["host-tracker-service:addresses"].first
+          @topology.add_host node['node-id'], [node_info['ip']], node_info['mac']
         end
       end
 

data/lib/topologygenerator/version.rb

@@ -1,3 +1,3 @@
 class Topologygenerator
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topologygenerator
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Andrés Laurito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,8 @@ files:
 - bin/console
 - bin/setup
 - images/topologygenerator.png
+- install_topologygenerator.sh
+- lib/Topologygenerator
 - lib/behaviors/serialize_behavior.rb
 - lib/builders_examples/pdm_builders/PhaseI/Flow_concrete_builder.rb
 - lib/builders_examples/pdm_builders/PhaseI/Host_concrete_builder.rb
@@ -126,9 +128,9 @@ files:
 - lib/builders_examples/ruby_builders/Router_concrete_builder.rb
 - lib/builders_examples/ruby_builders/output_concrete_builder.rb
 - lib/command_line/command_line_arguments.rb
-- lib/createTopology.rb
 - lib/flows_distributions/constant_distribution.rb
 - lib/flows_distributions/exponential_distribution.rb
+- lib/flows_distributions/felix_distribution.rb
 - lib/flows_distributions/normal_distribution.rb
 - lib/flows_distributions/pareto_distribution.rb
 - lib/flows_distributions/split_distribution.rb
@@ -139,8 +141,10 @@ files:
 - lib/network_entities/physical/link.rb
 - lib/network_entities/physical/router.rb
 - lib/network_entities/topology.rb
+- lib/network_topologies_examples/PhaseI_LAr_MonitoringHLT.rb
 - lib/network_topologies_examples/PhaseI_onlyLAr_1FelixTo1SWROD.rb
 - lib/network_topologies_examples/octopus_topology.rb
+- lib/network_topologies_examples/paper_example.rb
 - lib/network_topologies_examples/phase1_topology_mininet/tdaq
 - lib/network_topologies_examples/phase1_topology_mininet/tdaq.py
 - lib/network_topologies_examples/sofisticated_octopus_topology.rb