dop_common 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 07527d17d603f0e24a7ac08b22e97a4d6b8d68c7
-  data.tar.gz: e3db1d8a02b4a4b8c6ed3ca1f7a5d718d9a3ae3a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWFiYTM0NDlhNjg1ODcwNGQ2ZjJiNjM1ZTc2Yjc2ZDgwYTU0ZGZmNg==
+  data.tar.gz: !binary |-
+    MjJkN2YwYWZlODRhYzNkN2E5NTU1ZTIyM2Q1ZGQ1Zjg5ZDQ5NDlhYg==
 SHA512:
-  metadata.gz: ec7e26b4587ededd9eb60174fb9e81d7e4c4f992a23a4cb0bf96230f6ed048b7008fe53dd73fc0b4cb8f783cdbb78e2eba4862bfab30a8645d94b2399694908d
-  data.tar.gz: a261d97e99b4a56976f1e12bb8eed7044e86798cd358f6fe2d271313eb17c4c5c0d801bc2dc715abf6f2905838350bba9292fc7d65863688b80a6b0d23e3c378
+  metadata.gz: !binary |-
+    ZDkyODg2YmNjYWY4Yjg2YTg2NWVmNDFkNGI5ZmZmNDIyODIxOTZlZTcyZjhh
+    N2RlNTJmMDEzNmExNzAxNTgyZGZlMzlhMTEzNjgwODE3MWY5ZWFlZTYyNzIy
+    ZjdmN2Y3ZTBiZjNmMzA5N2M2NTJiZjc1MDhkOGU4MjVjNDlmMTc=
+  data.tar.gz: !binary |-
+    MTZiZjZlNjk4OTY1NGYzNWQ2NDJkZTM1MWZmZWQ4OTZkN2I5YzlmOWQyMmMx
+    ZDUwZGNlMjc2YTk3NjY1NjJiMjAwZDcxYjIxMmNjNTk5MGJhZGM3YzY2ZGNl
+    N2EzMmRhNjRlNzQ0Nzg4ODAzY2JmZGQ2MTg0YTBhMWUxNzlhZTQ=

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to dop_common will be documented in this file.
 
+## [0.15.2]
+### Added
+- Add node list property tags for vmware / vsphere
+
 ## [0.15.1]
 ### Fixed
 - Fix the default plan store path for the hiera plugin and add some more tests

data/doc/plan_format_v0.0.1.md

@@ -478,9 +478,9 @@ a property name is actually a keyword of a node hash.
 
  8. __*credentials*__ - an optional property to define credentials for
     administrator user (root, Administrator). This information is passed to
-	the customization tool (cloud-init, VSphere customization, etc.). Following
+	the customization tool (cloud-init, VSphere-based windows-guests customization, etc.). Following
 	data can be specified:
-    * __*root_password*__ - super user password that is set for cloud init phase,
+    * __*root_password*__ - super user password that is set for cloud init phase (IMPORTANT: not supported in VSphere).
     * __*root_ssh_keys*__ - an array of OpenSSH public keys that are recorded
       into `/root/.ssh/authorized_keys` by cloud init.
     * __*administrator_password*__ - an optional property that specifies the
@@ -535,7 +535,7 @@ a property name is actually a keyword of a node hash.
      __IMPORTANT:__ This property is required when customizing guest on *VSPhere* provider.
 
  14. __*product_id*__ - an optional, VSphere-specific windows-only guest customization
-     property that specifies a serial number. Its default value is
+     property that specifies a serial number. The default value is
      undefined which leaves the guest OS in an evaluation/trial mode.
 
  15. __*organization_name*__ - a required, VSphere-specific windows-only guest
@@ -556,6 +556,14 @@ a property name is actually a keyword of a node hash.
 
      __IMPORTANT__: Do not use this property for other cloud provider types than VSphere.
 
+ 18. __*tags*__ - a optional, VSphere-specific, property that instructs the VSphere provider
+     to associate the given node with the listed tags
+
+     __IMPORTANT__: Do not use this property for other cloud provider types than VSphere.
+     __IMPORTANT__: Requires minimum version 6.0.0 of VSphere.
+     __IMPORTANT__: Raises an error if the tag does not exist.
+
+
 The example bellow shows a specification for a database backend and a web node:
 ```yaml
 nodes:

data/lib/dop_common/node.rb

@@ -78,6 +78,7 @@ module DopCommon
       log_validation_method('credentials_valid?')
       log_validation_method('dns_valid?')
       log_validation_method('data_disks_valid?')
+      log_validation_method('tags_valid?')
       try_validate_obj("Node #{@name}: Can't validate the interfaces part because of a previous error"){interfaces}
       try_validate_obj("Node #{@name}: Can't validate the infrastructure_properties part because of a previous error"){infrastructure_properties}
       try_validate_obj("Node #{@name}: Can't validate the dns part because of a previous error"){dns}
@@ -194,6 +195,10 @@ module DopCommon
       @parsed_hooks
     end
 
+    def tags
+      @tags ||= tags_valid? ? create_tags : nil
+    end
+
   protected
 
     attr_writer :name
@@ -453,5 +458,24 @@ module DopCommon
         )
       end
     end
+
+    def tags_valid?
+      return false if @hash[:tags].nil?
+      raise PlanParsingError, "Node #{@node}: The 'thin_clone' can be used only for VSphere provider" unless
+          (infrastructure.provides?(:vsphere) || infrastructure.provides?(:vmware))
+      [String, Symbol, Array].include?(@hash[:tags].class) or
+          raise PlanParsingError, "Node #{name}: 'tags' has to be a string, symbol or array"
+      [@hash[:tags]].flatten.each do |tag|
+        [String, Symbol].include?(tag.class) or
+            raise PlanParsingError, "Node #{name}: the 'tags' array should only contain strings, symbols"
+      end
+    end
+
+
+    def create_tags
+      [@hash[:tags]].flatten.map do |tag|
+        tag.to_s
+      end
+    end
   end
 end

data/lib/dop_common/version.rb

@@ -1,3 +1,3 @@
 module DopCommon
-  VERSION = '0.15.1'
+  VERSION = '0.15.2'
 end

data/spec/dop_common/node_spec.rb

@@ -670,4 +670,55 @@ describe DopCommon::Node do
       end
     end
   end
+
+
+  describe '#tags' do
+    it 'will return nil if tags not specified' do
+      node = DopCommon::Node.new(
+          'dummy',
+          {'infrastructure' => 'vsphere'},
+          {:parsed_infrastructures => @infrastructures}
+      )
+      expect(node.tags).to be_nil
+    end
+    it 'will return a value if specified properly' do
+      node = DopCommon::Node.new(
+          'dummy',
+          {'infrastructure' => 'vsphere', 'tags' => ['tag_a', 'tag_c']},
+          {:parsed_infrastructures => @infrastructures}
+      )
+      expect(node.tags).to eq(['tag_a', 'tag_c'])
+      node = DopCommon::Node.new(
+          'dummy',
+          {'infrastructure' => 'vsphere', 'tags' => [:tag_b]},
+          {:parsed_infrastructures => @infrastructures}
+      )
+      expect(node.tags).to eq(['tag_b'])
+    end
+    it 'will raise an error if "tags" is of invalid type' do
+      node = DopCommon::Node.new(
+          'dummy',
+          {'infrastructure' => 'vsphere', 'tags' => false},
+          {:parsed_infrastructures => @infrastructures}
+      )
+      expect{node.tags}.to raise_error DopCommon::PlanParsingError
+    end
+
+    it 'will return nil in case of invalid provider type' do
+      node = DopCommon::Node.new(
+          'dummy',
+          {'infrastructure' => 'rhev'},
+          {:parsed_infrastructures => @infrastructures}
+      )
+      expect(node.tags).to be_nil
+    end
+    it 'will raise an error if "tags" specified in case of invalid provider type' do
+      node = DopCommon::Node.new(
+          'dummy',
+          {'infrastructure' => 'rhev', 'tags' => ['tag_a']},
+          {:parsed_infrastructures => @infrastructures}
+      )
+      expect{node.tags}.to raise_error DopCommon::PlanParsingError
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dop_common
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Andreas Zuber
@@ -9,186 +9,185 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2018-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: lockfile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-legacy_formatters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      This gem is part of the Deployment and Orchestration for Puppet
-      or DOP for short. dop_common is a library for the parsing and
-      validation of DOP plan files.
+description: ! "    This gem is part of the Deployment and Orchestration for Puppet\n
+  \   or DOP for short. dop_common is a library for the parsing and\n    validation
+  of DOP plan files.\n"
 email:
 - zuber@puzzle.ch
 - pavol.dilung@swisscom.com
@@ -197,9 +196,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
+- .gitignore
+- .rspec
+- .ruby-version
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -299,17 +298,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: !binary |-
+        MS44Ljc=
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: DOP plan file parser and validation library