topologygenerator 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fd92075635331f510cb62b3e2adabed7649e06c
-  data.tar.gz: 726efd0a6d1228386ef3705897e2ce4c281e6b10
+  metadata.gz: eafb2543e3876c05948503909a8e60e442cac869
+  data.tar.gz: fd22daaaaf90d9e9db7a67374259b6bb534e7e85
 SHA512:
-  metadata.gz: ded425491ac178a9bb47def9c297dac972cfef74a38dcc248bd449c21f0763e1a1bb800c32fa038a97a0b997f8b4e5847f834c933799761ed893a2bafe9579a0
-  data.tar.gz: c4337f577cb8d0ef748ee870bc5fe42ed7e49ded73e4b405527e7c4a6ca1163e9d9ffbccf6496ed6eddaf82095519094976437557e4325bce89a3aadb9e23f96
+  metadata.gz: 91dbd5028611587905f8394e0e57f4daec0be02df4d2de1c8ab0a677e20a299ec413296b21c9a037ad736982223c486a29376017f17ff816f2f6ee8c08a5dd33
+  data.tar.gz: 5da9d2b2594e9e3727b3af542dd142e54c8f5653b896c6b5adcac7d5561ea3026db75db5f62fdda5a4c4dbce3a2675a2c8f023cad33e7d701d6cea4f6b69d45c

data/lib/command_line/command_line_arguments.rb

@@ -35,12 +35,16 @@ class CommandLineArguments
             options.default :outDir => 'output'
             options.default :dirBuilders => 'builders_examples/pdm_builders/PhaseI'
           	new_source = options.name
-            raise ArgumentError, "The source '#{new_source}' is not one of the expected. Please type source --help to more information." unless ['ONOS','CUSTOM'].include? new_source
+            raise ArgumentError, "The source '#{new_source}' is not one of the expected. Please type source --help to more information." unless ['ONOS','OPENDAYLIGHT','CUSTOM'].include? new_source
 
             if new_source == 'ONOS'
                 new_uri_resource = options.uri 
                 new_uri_resource = ask 'http source for ONOS?:(example http://127.0.0.1:8181/onos/v1/)' unless new_uri_resource
                 raise ArgumentError, "You must specify a valid http source when the option ONOS is selected. #{new_uri_resource} is not a valid one" unless new_uri_resource =~ /\A#{URI::regexp(['http', 'https'])}\z/
+            elsif new_source == 'OPENDAYLIGHT'
+              new_uri_resource = options.uri 
+                new_uri_resource = ask 'http source for OPENDAYLIGHT?:(example http://localhost:8080/restconf/operational/network-topology:network-topology/topology/flow:1/)' unless new_uri_resource
+                raise ArgumentError, "You must specify a valid http source when the option OPENDAYLIGHT is selected. #{new_uri_resource} is not a valid one" unless new_uri_resource =~ /\A#{URI::regexp(['http', 'https'])}\z/
             elsif new_source == 'CUSTOM'
                 new_uri_resource = options.uri
                 new_uri_resource = ask 'uri source for CUSTOM?:(example network_topologies_examples/tree_topology.rb)' unless new_uri_resource

data/lib/network_topologies_examples/tree_topology.rb

@@ -62,7 +62,7 @@ module NetworkTopology
         flow_1_path.add_link link3
         @topology.add_flow "Flow1", 
                             10, 
-                            flow_1_path, 
+                            [flow_1_path], 
                             (ExponentialDistribution.new 1.0/6875), 
                             (ConstantDistribution.new 1000*8)
 
@@ -71,7 +71,7 @@ module NetworkTopology
         flow_2_path.add_link link3
         @topology.add_flow "Flow2", 
                             15, 
-                            flow_2_path, 
+                            [flow_2_path], 
                             (ExponentialDistribution.new 1.0/6875), 
                             (ConstantDistribution.new 1000*8)
 
@@ -80,7 +80,7 @@ module NetworkTopology
         flow_3_path.add_link link5
         @topology.add_flow "Flow3", 
                             20, 
-                            flow_3_path, 
+                            [flow_3_path], 
                             (ExponentialDistribution.new 1.0/6875), 
                             (ConstantDistribution.new 1000*8)                            
 

data/lib/providers/apis/opendaylight_topology_provider.rb

@@ -0,0 +1,112 @@
+require 'typhoeus'
+require_relative "../interface_topology_provider.rb"
+require_relative "../../network_entities/topology.rb"
+require_relative '../../network_entities/abstracts/path.rb'
+
+class OpendaylightTopologyProvider < ITopologyProvider
+
+    attr_accessor :uri_resource
+    
+    def initialize(new_uri_resource)
+          raise ArgumentError, 'No uri recieved as parameter' unless new_uri_resource
+          @uri_resource = new_uri_resource
+          @topology = Topology.new
+    end
+
+=begin
+This is who it looks like the xml received by the opendaylight api
+
+<topology>
+  <topology-id>flow:1</topology-id>
+  <node>
+    <node-id>openflow:1</node-id>
+    <inventory-node-ref>/a:nodes/a:node[a:id='openflow:1']</inventory-node-ref>
+    <termination-point>
+      <tp-id>openflow:1:2</tp-id>
+      <inventory-node-connector-ref>/a:nodes/a:node[a:id='openflow:1']/a:node-connector[a:id='openflow:1:2']</inventory-node-connector-ref>
+    </termination-point>
+    <termination-point>
+      <tp-id>openflow:1:1</tp-id>
+      <inventory-node-connector-ref>/a:nodes/a:node[a:id='openflow:1']/a:node-connector[a:id='openflow:1:1']</inventory-node-connector-ref>
+    </termination-point>
+    <termination-point>
+      <tp-id>openflow:1:LOCAL</tp-id>
+      <inventory-node-connector-ref>/a:nodes/a:node[a:id='openflow:1']/a:node-connector[a:id='openflow:1:LOCAL']</inventory-node-connector-ref>
+    </termination-point>
+  </node>
+  <node>
+    <node-id>host:52:57:c6:e4:b3:33</node-id>
+    <id>52:57:c6:e4:b3:33</id>
+    <addresses>
+      <id>1</id>
+      <mac>52:57:c6:e4:b3:33</mac>
+      <ip>10.0.0.2</ip>
+      <first-seen>1480973744947</first-seen>
+      <last-seen>1480973744947</last-seen>
+    </addresses>
+    <attachment-points>
+      <tp-id>openflow:2:2</tp-id>
+      <active>true</active>
+      <corresponding-tp>host:52:57:c6:e4:b3:33</corresponding-tp>
+    </attachment-points>
+    <termination-point>
+      <tp-id>host:52:57:c6:e4:b3:33</tp-id>
+    </termination-point>
+  </node>
+  <link>
+    <link-id>openflow:1:2</link-id>
+    <source>
+      <source-node>openflow:1</source-node>
+      <source-tp>openflow:1:2</source-tp>
+    </source>
+    <destination>
+      <dest-node>openflow:2</dest-node>
+      <dest-tp>openflow:2:1</dest-tp>
+    </destination>
+  </link>
+  <link>
+    <link-id>host:5e:66:e6:c2:d0:02/openflow:3:1</link-id>
+    <source>
+      <source-node>host:5e:66:e6:c2:d0:02</source-node>
+      <source-tp>host:5e:66:e6:c2:d0:02</source-tp>
+    </source>
+    <destination>
+      <dest-node>openflow:3</dest-node>
+      <dest-tp>openflow:3:1</dest-tp>
+    </destination>
+  </link>
+</topology>
+=end
+    
+    def get_topology
+      response = Typhoeus.get "#{@uri_resource}/restconf/operational/network-topology:network-topology/topology/flow:1/", userpwd:"admin:admin"
+      topology_json_response = (JSON.parse response.body)['topology'].first
+      nodes_info = topology_json_response['node']
+      links_info = topology_json_response['link']
+
+      nodes_info.each do |node|
+        if node['node-id'].include? 'openflow'
+          @topology.add_router node['node-id']
+        else
+          @topology.add_host node['node-id'], node['ip'], node['mac']
+        end
+      end
+
+      links_info.each do |link|
+        source = @topology.get_element_by_id link['source']['source-node']
+        destiny = @topology.get_element_by_id link['destination']['dest-node']
+
+        #TODO: WHICH IS THE FORM OF FINDING THE PORT OF THE HOST?
+        source_port = (source.is_a? Host) ? 1 : (link['source']['source-tp'].gsub "#{source.id}:", '').to_i
+        destiny_port = (destiny.is_a? Host) ? 1 : (link['destination']['dest-tp'].gsub "#{destiny.id}:", '').to_i
+
+        @topology.add_link link['link-id'], source, source_port, destiny, destiny_port
+      end
+
+      @topology.topology_elements
+    end    
+
+    def get_path_between(source, destination)
+      raise NotImplementedError, "OpenDayLight provider: This method is not implemented!"      
+    end
+end

data/lib/providers/customs/object_topology_provider.rb

@@ -0,0 +1,15 @@
+class ObjectTopologyProvider < ITopologyProvider
+  attr_reader :uri_resource
+
+  def initialize(topology)
+      @topology = topology
+  end
+
+  def get_topology
+     @topology
+  end
+
+  def get_path_between(source, destination)
+  	raise NotImplementedError, "ITopologyProvider: Implement this method in a child class"
+  end
+end

data/lib/topologygenerator/version.rb

@@ -1,3 +1,3 @@
 class Topologygenerator
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/topologygenerator.rb

@@ -1,6 +1,8 @@
 require_relative "topologygenerator/version"
 require_relative 'providers/apis/onos_topology_provider.rb'
+require_relative 'providers/apis/opendaylight_topology_provider.rb'
 require_relative 'providers/customs/custom_topology_provider.rb'
+require_relative 'providers/customs/object_topology_provider.rb'
 require_relative 'output_builder.rb'
 require 'byebug'
 
@@ -8,6 +10,8 @@ require 'byebug'
 class Topologygenerator
   attr_reader :topology_provider, :output_builder
 
+  LIST_PROVIDERS_IMPLEMENTED = ['ONOS', 'OPENDAYLIGHT','CUSTOM', 'OBJECT'] #TODO: Receive the providers from t
+
   def initialize(arguments)
     validate arguments
     @arguments = arguments
@@ -15,10 +19,12 @@ class Topologygenerator
     case @arguments['source']
         when 'ONOS'
             @topology_provider = OnosTopologyProvider.new @arguments['uri_resource']
+        when 'OPENDAYLIGHT'
+            @topology_provider = OpendaylightTopologyProvider.new @arguments['uri_resource']
         when 'CUSTOM'
             @topology_provider = CustomTopologyProvider.new @arguments['uri_resource']
-        else
-            raise ArgumentError, "The source: #{@arguments['source']} is not one of the expected"
+        when 'OBJECT'
+            @topology_provider = ObjectTopologyProvider.new @arguments['uri_resource']
     end
   end
   
@@ -32,5 +38,7 @@ class Topologygenerator
     ["source","directory_concrete_builders","output_directory", "uri_resource"].each do |argument_name|
       raise ArgumentError, "It is mandatory that arguments has a #{argument_name}" unless arguments.key? argument_name
     end
+
+    raise ArgumentError, "The source: #{arguments['source']} is not one of the expected" unless LIST_PROVIDERS_IMPLEMENTED.include? arguments['source']
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topologygenerator
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Andrés Laurito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,7 +148,9 @@ files:
 - lib/network_topologies_examples/tree_topology.rb
 - lib/output_builder.rb
 - lib/providers/apis/onos_topology_provider.rb
+- lib/providers/apis/opendaylight_topology_provider.rb
 - lib/providers/customs/custom_topology_provider.rb
+- lib/providers/customs/object_topology_provider.rb
 - lib/providers/interface_topology_provider.rb
 - lib/topologygenerator.rb
 - lib/topologygenerator/version.rb