docker-swarm-api 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bd5f9e395b5a9eeb81a49a3cb64346ba973e706
-  data.tar.gz: b8d22beaefe635920fdc9e0d5cba0944f439c001
+  metadata.gz: df2548b509bebf94428c7bdbfbfc43ea3d2f3311
+  data.tar.gz: 0381001594e826d6b621d2598b96b52b2e2db15c
 SHA512:
-  metadata.gz: f303af9181d8eb976b1db9a973c2824dd4b3da3e9a64386c16e67a151ddb6f47d63a9053f9ea4c123f78566998f522ec2a841e40e0348ccc096ae7aac672d84a
-  data.tar.gz: d62b8b6e3921bbeafb9ca58ad864c7e3e72dcd60968d4d2d80a1da6e58551b98bb2186315a7042bd645f3dda392f5f08b87ff24396d8c05b5da501e45f9bb65d
+  metadata.gz: fed1ac9841af1977852dd9d609ddda922987d0e1d45abe03cbe075923ab411e3da863f5b1260cfe72c14592602a3d6218e6a7c94eb71ecb14b87356998c42ac8
+  data.tar.gz: 8458904be3f28de9125ba98a8f596ea1382bdcf6248761de7125c0b59998e082cfbbfe0daccdaf9298521b3102398ebd318421fd20ca7046e15000f066d7bd3b

data/lib/docker/swarm/network.rb

@@ -30,24 +30,15 @@ class Docker::Swarm::Network
     end
     return []
   end
-  
 
   def remove
-    network_name = name
-    response = @swarm.connection.delete("/networks/#{id()}", {}, expects: [200, 204, 500], full_response: true)
-    if (response.status > 204)
-      raise "Error deleting network (#{name})  HTTP-#{response.status}  #{response.body}"
-    end
-    
-    attempts = 0
-    while (@swarm.find_network_by_name(network_name) != nil)
-      sleep 1
-      attempts += 1
-      if (attempts > 30)
-        raise "Failed to remove network: #{network_name}, operation timed out. Response: HTTP#{response.status}  #{response.body}"
+    if (@swarm)
+      @swarm.nodes.each do |node|
+        node.remove_network(self)
       end
     end
   end
+  
 end
 
 # EXAMPLE INSPECT OF OVERLAY NETWORK:

data/lib/docker/swarm/node.rb

@@ -1,8 +1,6 @@
 # This class represents a Docker Swarm Node.
 class Docker::Swarm::Node
-  #include Docker::Base
-  attr_reader :hash
-  attr_accessor :connection
+  attr_reader :hash, :swarm
   AVAILABILITY = {
     active: "active",
     drain:  "drain"
@@ -27,6 +25,14 @@ class Docker::Swarm::Node
     return @hash['Description']['Hostname']
   end
   
+  def connection
+    if (@swarm) && (@swarm.node_hash[id()])
+      return @swarm.node_hash[id()][:connection]
+    else
+      return nil
+    end
+  end
+  
   def role
     if (@hash['Spec']['Role'] == "worker")
       return :worker
@@ -55,6 +61,15 @@ class Docker::Swarm::Node
     end
   end
   
+  def swarm_connection
+    node_hash = @swarm.node_hash[self.id]
+    if (node_hash)
+      return node_hash[:connection]
+    end
+    return nil
+  end
+
+  
   def running_tasks
     return tasks.select {|t| t.status == 'running'}
   end
@@ -80,6 +95,33 @@ class Docker::Swarm::Node
     Docker::Swarm::Node.remove(self.id, @swarm.connection)
   end
   
+  
+  def remove_network_with_name(network_name)
+    network = find_network_by_name(network_name)
+    self.remove_network(network) if (network)
+  end
+  
+  def remove_network(network)
+    attempts = 0
+    if (self.connection == nil)
+      puts "Warning:  node asked to remove network, but no connection for node: #{self.id} #{self.host_name}"
+    else
+      while (self.find_network_by_id(network.id) != nil)
+        response = self.connection.delete("/networks/#{network.id}", {}, expects: [204, 404, 500], full_response: true)
+        if (response.status == 500)
+          puts "Warning:  Deleting network (#{network.name}) from #{self.host_name} returned HTTP-#{response.status}  #{response.body}"
+        end
+  
+        sleep 1
+        attempts += 1
+        if (attempts > 30)
+          raise "Failed to remove network: #{network.name} from #{self.host_name}, operation timed out. Response: HTTP#{response.status}  #{response.body}"
+        end
+      end
+    end
+  end
+  
+  
   def leave(force = true)
     drain(wait_for_drain: true, wait_seconds: 60)
     # change_availability(:active)
@@ -99,12 +141,50 @@ class Docker::Swarm::Node
     end
   end
   
+  def networks()
+    if (connection)
+      return Docker::Swarm::Node.networks_on_host(connection, @swarm)
+    else
+      debugger
+      raise "No connection set for node: #{self.host_name}, ID: #{self.id}"
+    end
+  end
+  
+  def find_network_by_name(network_name)
+    networks.each do |network|
+      if (network.name == network_name)
+        return network
+      end
+    end
+    return nil
+  end
+
+  def find_network_by_id(network_id)
+    networks.each do |network|
+      if (network.id == network_id)
+        return network
+      end
+    end
+    return nil
+  end
+  
+  
   def self.remove(node_id, connection)
     query = {}
     response = connection.delete("/nodes/#{node_id}", query, expects: [200, 406, 500], full_response: true)
     if (response.status != 200)
-      raise "Error deleting node: #{response.body}"
+      raise "Error deleting node: HTTP-#{response.status} #{response.body}"
+    end
+  end
+  
+  def self.networks_on_host(connection, swarm)
+    networks = []
+    response = connection.get("/networks", {}, full_response: true, expects: [200])
+    network_hashes = JSON.parse(response.body)
+    network_hashes.each do |network_hash|
+      networks << Docker::Swarm::Network.new(swarm, network_hash)
     end
+    return networks
   end
   
   

data/lib/docker/swarm/service.rb

@@ -49,7 +49,6 @@ class Docker::Swarm::Service
     self.update(@hash['Spec'])
   end
 
-
   def self.DEFAULT_OPTIONS
     default_service_create_options = {
         "Name" => "<<Required>>",

data/lib/docker/swarm/swarm.rb

@@ -7,15 +7,6 @@ class Docker::Swarm::Swarm
   include Docker
   attr_reader :worker_join_token, :manager_join_token, :id, :hash, :node_hash
 
-  def initialize(hash, manager_connection, options = {})
-    @hash = hash
-    @id = hash['ID']
-    @worker_join_token = hash['JoinTokens']['Worker']
-    @manager_join_token = hash['JoinTokens']['Manager']
-    @node_hash = {}
-    @manager_connection = manager_connection
-  end
-  
   def store_manager(manager_connection, listen_address_and_port)
     node = nodes.find {|n| 
       (n.hash['ManagerStatus']) && (n.hash['ManagerStatus']['Leader'] == true) && (n.hash['ManagerStatus']['Addr'] == listen_address_and_port) 
@@ -24,6 +15,11 @@ class Docker::Swarm::Swarm
     @node_hash[node.id] = {hash: node.hash, connection: manager_connection}
   end
 
+  def update_data(hash)
+    @hash = hash
+  end
+ 
+
   def join(node_connection, join_token = nil, listen_address = "0.0.0.0:2377")
     join_token = @worker_join_token
     node_ids_before = nodes().collect {|n| n.id}
@@ -100,7 +96,6 @@ class Docker::Swarm::Swarm
   end
 
   def leave(node, force = false)
-    node.connection = self.connection
     node_info = @node_hash[node.id]
     if (node_info)
       Docker::Swarm::Swarm.leave(force, node_info[:connection])
@@ -147,41 +142,46 @@ class Docker::Swarm::Swarm
   end
   
   def create_network_overlay(network_name)
-    subnet_16_parts = [10, 11, 0, 0]
-    
+    subnet_16_parts = [10, 10, 0, 0]
     max_vxlanid = 200
-    networks.each do |network|
-      if (network.driver == 'overlay')
-        if (network.hash['Options'])
-          vxlanid = network.hash['Options']["com.docker.network.driver.overlay.vxlanid_list"]
-          if (vxlanid) && (vxlanid.to_i > max_vxlanid)
-            max_vxlanid = vxlanid.to_i
+    
+    # Sometimes nodes have leftover networks not on other nodes, that have subnets that can't be duplicated in
+    # the new overlay network.
+    nodes.each do |node|
+      node.networks.each do |network|
+        if (network.driver == 'overlay')
+          if (network.hash['Options'])
+            vxlanid = network.hash['Options']["com.docker.network.driver.overlay.vxlanid_list"]
+            if (vxlanid) && (vxlanid.to_i > max_vxlanid)
+              max_vxlanid = vxlanid.to_i
+            end
           end
         end
-      end
       
-      # Make sure our new network doesn't duplicate subnet of other network.
-      if (network.hash['IPAM']) && (network.hash['IPAM']['Config'])
-        network.hash['IPAM']['Config'].each do |subnet_config|
-          if (subnet_config['Subnet'])
-            subnet = subnet_config['Subnet']
-            subnet = subnet.split(".")
-            if (subnet[0] == '10') && (subnet[1] == '255')
-            else
-              if (subnet[0].to_i == subnet_16_parts[0])
-                if (subnet[1].to_i >= subnet_16_parts[1])
-                  subnet_16_parts[1] = subnet[1].to_i + 1
-                  if (subnet_16_parts[1] >= 255)
-                    raise "Ran out of subnets"
+        # Make sure our new network doesn't duplicate subnet of other network.
+        if (network.hash['IPAM']) && (network.hash['IPAM']['Config'])
+          network.hash['IPAM']['Config'].each do |subnet_config|
+            if (subnet_config['Subnet'])
+              subnet = subnet_config['Subnet']
+              subnet = subnet.split(".")
+              if (subnet[0] == '10') && (subnet[1] == '255')
+              else
+                if (subnet[0].to_i == subnet_16_parts[0])
+                  if (subnet[1].to_i >= subnet_16_parts[1])
+                    subnet_16_parts[1] = subnet[1].to_i + 1
+                    if (subnet_16_parts[1] >= 255)
+                      raise "Ran out of subnets"
+                    end
                   end
                 end
               end
+  #            subnet_config['Gateway']
             end
-#            subnet_config['Gateway']
           end
         end
       end
     end
+    
 
     options = {
         "Name" => network_name,
@@ -192,8 +192,8 @@ class Docker::Swarm::Swarm
           "Driver" => "default",
           "Config" => [
             {
-             "Subnet": "#{subnet_16_parts.join(".")}/16",
-             "Gateway": "#{subnet_16_parts[0, 3].join('.')}.1"
+             "Subnet" => "#{subnet_16_parts.join(".")}/16",
+             "Gateway"=> "#{subnet_16_parts[0, 3].join('.')}.1"
            }
           ],
            "Options" => {
@@ -211,15 +211,6 @@ class Docker::Swarm::Swarm
       create_network(options)
   end
   
-  def find_network_by_name(network_name)
-    networks.each do |network|
-      if (network.name == network_name)
-        return network
-      end
-    end
-    return nil
-  end
-
   # Return all of the Nodes.
   def nodes
     opts = {}
@@ -278,10 +269,11 @@ class Docker::Swarm::Swarm
     return items
   end
   
+  
   # Initialize Swarm
   def self.init(opts, connection)
     query = {}
-    resp = connection.post('/swarm/init', query, :body => opts.to_json, full_response: true, expects: [200, 404, 500])
+    resp = connection.post('/swarm/init', query, :body => opts.to_json, full_response: true, expects: [200, 404, 406, 500])
     if (resp.status == 200)
       swarm = Docker::Swarm::Swarm.swarm(opts, connection)
       manager_node = swarm.nodes.find {|n|  
@@ -296,14 +288,19 @@ class Docker::Swarm::Swarm
   end
 
   # docker swarm join-token -q worker
-  def self.swarm(opts, connection)
+  def self.swarm(options, connection)
     query = {}
-    resp = connection.get('/swarm', query, :body => opts.to_json, expects: [200, 404, 406], full_response: true)
+    resp = connection.get('/swarm', query, :body => options.to_json, expects: [200, 404, 406], full_response: true)
     if (resp.status == 406) || (resp.status == 404)
       return nil
     elsif (resp.status == 200)
       hash = JSON.parse(resp.body)
-      return Docker::Swarm::Swarm.new(hash, connection)
+      swarm = self.find_swarm_for_id(hash['ID'])  
+      if (swarm)
+        swarm.update_data(hash)
+      else
+        swarm = Docker::Swarm::Swarm.new(hash, connection, options)
+      end
     else
       raise "Bad response: #{resp.status} #{resp.body}"
     end
@@ -322,7 +319,13 @@ class Docker::Swarm::Swarm
     query = {}
     response = connection.get('/swarm', query, expects: [200, 404, 406], full_response: true)
     if (response.status == 200)
-      swarm = Docker::Swarm::Swarm.new(JSON.parse(response.body), connection, options)
+      hash = JSON.parse(response.body)
+      swarm = self.find_swarm_for_id(hash['ID'])  
+      if (swarm)
+        swarm.update_data(hash)
+      else
+        swarm = Docker::Swarm::Swarm.new(hash, connection, options)
+      end
       manager_node = swarm.nodes.find {|n|  
         (n.hash['ManagerStatus']) && (n.hash['ManagerStatus']['Leader'] == true) 
       }
@@ -336,5 +339,25 @@ class Docker::Swarm::Swarm
     end
   end
   
+  
+ private
+ @@swarms = {}
+ 
+ def self.find_swarm_for_id(swarm_id)
+   return @@swarms[swarm_id]
+ end
+ 
+ def initialize(hash, manager_connection, options = {})
+   @hash = hash
+   @id = hash['ID']
+   @worker_join_token = hash['JoinTokens']['Worker']
+   @manager_join_token = hash['JoinTokens']['Manager']
+   @node_hash = {}
+   @manager_connection = manager_connection
+   @@swarms[@id] = self
+ end
+ 
+ 
+  
 
 end

data/lib/docker/swarm/version.rb

@@ -1,7 +1,7 @@
 module Docker
   module Swarm
     # The version of the docker-api gem.
-    VERSION = '1.2.4'
+    VERSION = '1.2.5'
 
     # The version of the compatible Docker remote API.
     API_VERSION = '1.24'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-swarm-api
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Mike Moore / Rogue Wave Software
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby API for Docker Swarm