rancher-metadata 0.17.11 → 0.17.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06a398d8834679e63072d85092638191281d1591
-  data.tar.gz: db28350fa5170a9824f104aebab069964979a4c1
+  metadata.gz: 626665a97ead5093041e9aaaf59b1c99a39cc015
+  data.tar.gz: bb9c92d332502485c99bc01ffc007f1e1ed24c5a
 SHA512:
-  metadata.gz: 1b8c126333e6789a1bd27090f8b63ca8136ad4322257601198c20ef730cfae8a717d99aa6806c4a09c4f36085516e999b5eb7a212bf89842a36d045360290ed4
-  data.tar.gz: bf78c2787050884ab9d3b72aaab7c56b006899eb28531a471d9690774071d283383aebfb4e73f1b6c7caa24b547826c822d80eec65e847f119e3d00f8f13ed32
+  metadata.gz: 0f75b2e64d1f16acecf84166dfec0e8d24bae7adebb921f56f65d46e1974ae455418ea525e735ef981b469143cf0201049f3d257f1a2983532bd3bb4bf318684
+  data.tar.gz: fadf695e79741f1f15cdb1a08863378ecec69c4c7e56025e7d7e741eab72fdcfc34e7ff278a406c7baef1f5c83cbe959b8a8305c611abc8d145113ccf125deff

data/README.md

@@ -16,14 +16,14 @@ require 'rancher-metadata'
 api = RancherMetadata::API.new({:api_url => "http://rancher-metadata/2015-12-19"})
 
 puts("Container create index: #{api.get_container_create_index}")
-puts("Container service suffix: #{api.get_container_service_suffix}")
+puts("Container service index: #{api.get_container_service_index}")
 puts("Container ip: #{api.get_container_ip}")
 puts("Container name: #{api.get_container_name}")
 puts("Container service name: #{api.get_container_service_name}")
 puts("Container hostname: #{api.get_container_hostname}")
 
 api.wait_service_containers do |name, container|
-  puts("Container #{name} is up (ip: #{container['primary_ip']}, create index: #{container['create_index']}, service suffix: #{container['service_suffix']})")
+  puts("Container #{name} is up (ip: #{container['primary_ip']}, create index: #{container['create_index']}, service index: #{container['service_index']})")
 end
 
 metadata = api.get_service_metadata
@@ -90,24 +90,24 @@ Look up a specific service running in another stack:
 puts(api.get_service({:service_name => 'my_service', :stack_name => 'my_stack'}).inspect)
 ```
 
-look up the current service's containers
+Look up the current service's containers
 ```
 api.get_service_containers.each do |name, container|
-  puts("Container #{name} (ip: #{container['primary_ip']}, create index: #{container['create_index']}, service suffix: #{container['service_suffix']})")
+  puts("Container #{name} (ip: #{container['primary_ip']}, create index: #{container['create_index']}, service index: #{container['service_index']})")
 end
 ```
 
-look up a specific service's containers running in the current stack:
+Look up a specific service's containers running in the current stack:
 ```
 api.get_service_containers({:service_name => 'my_service'}).each do |name, container|
-  puts("Container #{name} (ip: #{container['primary_ip']}, create index: #{container['create_index']}, service suffix: #{container['service_suffix']})")
+  puts("Container #{name} (ip: #{container['primary_ip']}, create index: #{container['create_index']}, service index: #{container['service_index']})")
 end
 ```
 
 Look up a specific service's containers running in an another stack:
 ```
 api.get_service_containers({:service_name => 'my_service', :stack_name => 'my_stack'}).each do |name, container|
-  puts("Container #{name} (ip: #{container['primary_ip']}, create index: #{container['create_index']}, service suffix: #{container['service_suffix']})")
+  puts("Container #{name} (ip: #{container['primary_ip']}, create index: #{container['create_index']}, service index: #{container['service_index']})")
 end
 ```
 

data/lib/rancher-metadata/api.rb

@@ -104,9 +104,6 @@ module RancherMetadata
 
       self.get_service_field("containers", service).each do |container|
         containers[container['name']] = container
-
-        # FIXME: until https://github.com/rancher/cattle/pull/1197 gets merged
-        containers[container['name']]['service_suffix'] = self.get_container_service_suffix(container['name']) unless container.has_key?('service_suffix')
       end
 
       containers
@@ -129,9 +126,6 @@ module RancherMetadata
         new = containers.keys()
 
         (new - old).each do |name|
-          # FIXME: until https://github.com/rancher/cattle/pull/1197 gets merged
-          containers[name]['service_suffix'] = self.get_container_service_suffix(name) unless containers[name].has_key?('service_suffix')
-
           yield(name, containers[name])
         end
 
@@ -168,11 +162,6 @@ module RancherMetadata
         container = self.api_get("/self/container")
       end
 
-      # FIXME: until https://github.com/rancher/cattle/pull/1197 gets merged
-      if container
-        container['service_suffix'] = self.get_container_service_suffix(container_name) unless container.has_key?('service_suffix')
-      end
-
       container
     end
 
@@ -180,10 +169,6 @@ module RancherMetadata
       container_name ? self.api_get("/containers/#{container_name}/#{field}") : self.api_get("/self/container/#{field}")
     end
 
-    def get_container_id(container_name = nil)
-      self.get_container_create_index(container_name)
-    end
-
     def get_container_create_index(container_name = nil)
      i = self.get_container_field("create_index", container_name)
      i ? i.to_i : nil
@@ -219,24 +204,9 @@ module RancherMetadata
       self.get_container_field("hostname", container_name)
     end
 
-    def get_container_service_id(container_name = nil)
-      self.get_container_service_suffix(container_name)
-    end
-
-    def get_container_service_suffix(container_name = nil)
-      index = nil
-
-      service_suffix = self.get_container_field("service_suffix", container_name)
-
-      if service_suffix.nil?
-        if (i = self.get_container_name(container_name)[/(\d+)$/, 1])
-          index = i.to_i
-        end
-      else
-        index = service_suffix.to_i
-      end
-
-      index
+    def get_container_service_index(container_name = nil)
+     i = self.get_container_field("service_index", container_name)
+     i ? i.to_i : nil
     end
 
     def get_container_host_uuid(container_name = nil)

data/lib/rancher-metadata/version.rb

@@ -5,7 +5,7 @@
 #
 
 module RancherMetadata
-  VERSION = "0.17.11"
+  VERSION = "0.17.12"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rancher-metadata
 version: !ruby/object:Gem::Version
-  version: 0.17.11
+  version: 0.17.12
 platform: ruby
 authors:
 - Matteo Cerutti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json