docker-swarm-api 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f231ed6bde66591fce70f5c3c5d653d3c21abd52
-  data.tar.gz: e33c69b6e3ad5a10a070d9de06f358093413780d
+  metadata.gz: 1bd5f9e395b5a9eeb81a49a3cb64346ba973e706
+  data.tar.gz: b8d22beaefe635920fdc9e0d5cba0944f439c001
 SHA512:
-  metadata.gz: 3885fddc8388316922b7a4371d1d10a64084a59fb8d373fd4e2a2df8fd76f241f510ce7bb4d098ed7427c95e2bf9f6702e52092b82372a6d9464a15abe033d52
-  data.tar.gz: 52a89eb4cede7dff51e836db236737711ceccd7e648d13ada96e18f50b5f91f7b18078194d10092306f3e21aa112d546389a81c581974bce888a1327efacbb29
+  metadata.gz: f303af9181d8eb976b1db9a973c2824dd4b3da3e9a64386c16e67a151ddb6f47d63a9053f9ea4c123f78566998f522ec2a841e40e0348ccc096ae7aac672d84a
+  data.tar.gz: d62b8b6e3921bbeafb9ca58ad864c7e3e72dcd60968d4d2d80a1da6e58551b98bb2186315a7042bd645f3dda392f5f08b87ff24396d8c05b5da501e45f9bb65d

data/lib/docker/swarm/network.rb

@@ -23,6 +23,14 @@ class Docker::Swarm::Network
   def driver
     return @hash['Driver']
   end
+  
+  def subnets
+    if (@hash['IPAM']) && (@hash['IPAM']['Config'])
+      return @hash['IPAM']['Config']
+    end
+    return []
+  end
+  
 
   def remove
     network_name = name
@@ -30,8 +38,14 @@ class Docker::Swarm::Network
     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}"
+      end
     end
   end
 end

data/lib/docker/swarm/service.rb

@@ -25,8 +25,10 @@ class Docker::Swarm::Service
   
   def network_ids
     network_ids = []
-    @hash['Endpoint']['VirtualIPs'].each do |network_info|
-      network_ids << network_info['NetworkID']
+    if (@hash['Endpoint']['VirtualIPs'])
+      @hash['Endpoint']['VirtualIPs'].each do |network_info|
+        network_ids << network_info['NetworkID']
+      end
     end
     return network_ids
   end

data/lib/docker/swarm/swarm.rb

@@ -147,6 +147,8 @@ class Docker::Swarm::Swarm
   end
   
   def create_network_overlay(network_name)
+    subnet_16_parts = [10, 11, 0, 0]
+    
     max_vxlanid = 200
     networks.each do |network|
       if (network.driver == 'overlay')
@@ -157,6 +159,28 @@ class Docker::Swarm::Swarm
           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"
+                  end
+                end
+              end
+            end
+#            subnet_config['Gateway']
+          end
+        end
+      end
     end
 
     options = {
@@ -167,13 +191,17 @@ class Docker::Swarm::Swarm
         "IPAM" => {
           "Driver" => "default",
           "Config" => [
+            {
+             "Subnet": "#{subnet_16_parts.join(".")}/16",
+             "Gateway": "#{subnet_16_parts[0, 3].join('.')}.1"
+           }
           ],
            "Options" => {
            }
         },
         "Internal" => false,
         "Options" => {
-            "com.docker.network.driver.overlay.vxlanid_list" => (max_vxlanid + 1).to_s
+          "com.docker.network.driver.overlay.vxlanid_list" => (max_vxlanid + 1).to_s
         },
         "Labels" => {
           # "com.example.some-label": "some-value",

data/lib/docker/swarm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-swarm-api
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Mike Moore / Rogue Wave Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,60 +98,60 @@ dependencies:
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: single_cov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: API for creating container clusters using Docker Swarm.  Includes service,
-  node, task management
+        version: '1.10'
+description: API for creating container clusters and services using Docker Swarm.  Includes
+  service, node, task management
 email: mike.moore@roguewave.com
 executables: []
 extensions: []
@@ -168,7 +168,7 @@ files:
 - lib/docker/swarm/swarm.rb
 - lib/docker/swarm/task.rb
 - lib/docker/swarm/version.rb
-homepage: https://github.com/maxerly/docker-swarm-api
+homepage: https://github.com/mikejmoore/docker-swarm-api
 licenses:
 - MIT
 metadata: {}
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby API for Docker Swarm