fog-vsphere 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6484c578c8862f6daabfc08133d6ce75e9115d19
-  data.tar.gz: 2350426ea93ab74418b4a83a036bdc9cb334de5f
+  metadata.gz: e5703036b88d40352d297136ef8ccb16d37002d0
+  data.tar.gz: 288684548ab71c5ea0034fb242b210be18626d3b
 SHA512:
-  metadata.gz: 1e97ddb8418174a55e6c09e3daae4d200eae177ed91058d512f5721a176afa5739a1aba9e187e0498e319d2c0c1e65e4f182b68ba67cee8db302814ecc4276b1
-  data.tar.gz: 826dbf47f157dc8667904ede7cc5fa29006f1e042816d4b60376ee628ab7a17325e78ca033a98240cb511eb6da2a1fbbb6df96a838f4dfc788f0d53cb58e0049
+  metadata.gz: 57e7615da7c6f5ca65c555f217fc972bdfaf1433936373798f139b0ca33a64fbeebc2161656d22f6ef6e1b8c0b8a49551c0953b20032b72d42d3a44cfb8bd61a
+  data.tar.gz: 24eff7e37397f64cd72ae14e453a81eae8e785281e68ac5bcc98092409233389cebf23b457245159303b7111aeece237a9fe5822ba1ff8d7d7682c69a81df34f

data/CONTRIBUTORS.md

@@ -61,6 +61,7 @@
 * Wesley Beary <geemus@gmail.com>
 * Xavier Fontrodona <xavier.fontrodona@safelayer.com>
 * alan <asebastian2@gmail.com>
+* c0puga <c0puga@walmart.com>
 * endzyme <nick.huanca@gmail.com>
 * geemus <geemus@gmail.com>
 * karmab <karimboumedhel@gmail.com>

data/lib/fog/vsphere/models/compute/rule.rb

@@ -12,6 +12,7 @@ module Fog
         # Type should be a class - either
         #  - RbVmomi::VIM::ClusterAntiAffinityRuleSpec
         #  - RbVmomi::VIM::ClusterAffinityRuleSpec
+        #  - RbVmomi::VIM::ClusterVmHostRuleInfo
         attribute :type
         attribute :vm_ids
         

data/lib/fog/vsphere/requests/compute/create_rule.rb

@@ -4,25 +4,17 @@ module Fog
       class Real
         def create_rule(attributes={})
           cluster = get_raw_cluster(attributes[:cluster], attributes[:datacenter])
-          # Check if it already exists and blow up if it does
-          # (otherwise ESX just happily accepts it and then considers it a conflict)
           rule = cluster.configurationEx.rule.find {|n| n[:name] == attributes[:name]}
           if rule
             raise ArgumentError, "Rule #{attributes[:name]} already exists!"
           end
-          # First, create the rulespec
-          vms = attributes[:vm_ids].to_a.map {|id| get_vm_ref(id, attributes[:datacenter])}
-          spec = attributes[:type].new(
-            name: attributes[:name],
-            enabled: attributes[:enabled],
-            vm: vms
-          )
+          spec = get_spec attributes
           # Now, attach it to the cluster
           cluster_spec = RbVmomi::VIM.ClusterConfigSpecEx(rulesSpec: [
-            RbVmomi::VIM.ClusterRuleSpec(
-              operation: RbVmomi::VIM.ArrayUpdateOperation('add'),
-              info: spec
-            )
+              RbVmomi::VIM.ClusterRuleSpec(
+                  operation: RbVmomi::VIM.ArrayUpdateOperation('add'),
+                  info: spec
+              )
           ])
           ret = cluster.ReconfigureComputeResource_Task(spec: cluster_spec, modify: true).wait_for_completion
           rule = cluster.configurationEx.rule.find {|n| n[:name] == attributes[:name]}
@@ -32,8 +24,29 @@ module Fog
             raise Fog::Vsphere::Errors::ServiceError, "Unknown error creating rule #{attributes[:name]}"
           end
         end
-        
+
+        private
+
+        def get_spec(attributes={})
+          if (attributes[:type].to_s == 'ClusterAntiAffinityRuleSpec' || attributes[:type].to_s == 'ClusterAffinityRuleSpec')
+            vms = attributes[:vm_ids].to_a.map {|id| get_vm_ref(id, attributes[:datacenter])}
+            attributes[:type].new(
+              name: attributes[:name],
+              enabled: attributes[:enabled],
+              vm: vms
+            )
+          elsif attributes[:type].to_s == 'ClusterVmHostRuleInfo'
+            attributes[:type].new(
+              name: attributes[:name],
+              enabled: attributes[:enabled],
+              mandatory: attributes[:mandatory],
+              vmGroupName: attributes[:vmGroupName],
+              affineHostGroupName: attributes[:affineHostGroupName]
+            )
+          end
+        end
       end
+
       class Mock
         def create_rule(attributes={})
           attributes[:key] = rand(9999)

data/lib/fog/vsphere/requests/compute/list_rules.rb

@@ -8,17 +8,23 @@ module Fog
         end
 
         protected
-      
+
         def rule_attributes(rule, filters)
-          {
-            datacenter: filters[:datacenter],
-            cluster:    filters[:cluster],
-            key:        rule[:key],
-            name:       rule[:name],
-            enabled:    rule[:enabled],
-            type:       rule.class,
-            vm_ids:     rule[:vm].map {|vm| vm.config.instanceUuid }
-          }
+          attributes = {}
+          attributes[:datacenter] = filters[:datacenter]
+          attributes[:cluster] = filters[:cluster]
+          attributes[:key] = rule[:key]
+          attributes[:name] = rule[:name]
+          attributes[:enabled] = rule[:enabled]
+          attributes[:type] = rule.class
+          if rule.class.to_s == 'ClusterAntiAffinityRuleSpec' || rule.class.to_s == 'ClusterAffinityRuleSpec'
+            attributes[:vm_ids] = rule[:vm].map {|vm| vm.config.instanceUuid}
+          elsif rule.class.to_s == 'ClusterVmHostRuleInfo'
+            attributes[:mandatory] = rule[:mandatory]
+            attributes[:vmGroupName] = rule[:vmGroupName]
+            attributes[:affineHostGroupName] = rule[:affineHostGroupName]
+          end
+          return attributes
         end
       end
       class Mock

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core