bosh_vcloud_cpi 0.5.0 → 0.5.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0c608586130394ee017d5d2eb63700ce63826aef
+  data.tar.gz: 5168386f10ca6b36060da0001a1f8363c37ecb2c
+SHA512:
+  metadata.gz: 05c93554f01ed00e7128a515da7ad005cc6a6faa3c1d4026b2e2f6fb2849ff4b2b9dc7d38be3a1119ba0593f84b462429554cc7cd083ba906ff0d94e467960d1
+  data.tar.gz: 3cb633a4b8a91a0ebc25850b43d493df15fd35c8597bf4af74e1e49ef0d9acc0f7e393deee8c65f0375d7e790d8f545e3b90f4fef34c090a313ed8f59a33cd8f

data/lib/cloud/vcloud/xml/wrapper.rb

@@ -183,27 +183,21 @@ module VCloudSdk
           parent.add_child(child.node)
         elsif child.is_a? String
           node = Nokogiri::XML::Node.new(child, parent)
-          if (namespace_prefix.nil? ^ namespace_href.nil?)
-            raise Bosh::Clouds::CpiError,
-              "Namespace prefix must both be nil or defined together."
-          end
-          # This is a little more cumbersome but Nokogiri has problems
-          # figuring out the right namespace prefix otherwise
-          if namespace_prefix
-            ns = node.add_namespace_definition(namespace_prefix,
-              namespace_href)
-            node.namespace = ns
-          end
+          set_namespace(node, namespace_prefix, namespace_href)
           parent.add_child(node)
         else
-          raise Bosh::Clouds::CpiError, "Cannot add child.  Unknown object passed in."
+          fail Bosh::Clouds::CpiError, "Cannot add child.  Unknown object passed in."
         end
       end
 
       # Creates a child node but does not add it to the document.  Used when
       # a new child node has to be in a specific location or order.
-      def create_child(tag)
-        Nokogiri::XML::Node.new(tag, @root)
+      def create_child(tag,
+          namespace_prefix = nil,
+          namespace_href = nil)
+        node = Nokogiri::XML::Node.new(tag, @root)
+        set_namespace(node, namespace_prefix, namespace_href)
+        node
       end
 
       protected
@@ -247,6 +241,25 @@ module VCloudSdk
         clone.namespace = default_ns
         clone
       end
+
+      def set_namespace(node, namespace_prefix, namespace_href)
+        if namespace_prefix.nil? && namespace_href.nil?
+          return
+        elsif namespace_prefix.nil? || namespace_href.nil?
+          fail Bosh::Clouds::CpiError,
+               "Namespace prefix must both be nil or defined together."
+        end
+
+        if !node.namespace.nil? &&
+            node.namespace.prefix == namespace_prefix &&
+            node.namespace.href == namespace_href
+          return
+        end
+
+        ns = node.add_namespace_definition(namespace_prefix,
+                                           namespace_href)
+        node.namespace = ns
+      end
     end
 
   end

data/lib/cloud/vcloud/xml/wrapper_classes/instantiate_vapp_template_params.rb

@@ -42,18 +42,32 @@ module VCloudSdk
         @local_exists = true
 
         locality.each do |k,v|
-          node_sp = create_child("SourcedVmInstantiationParams")
+          node_sp = create_child("SourcedVmInstantiationParams",
+                                 namespace.prefix,
+                                 namespace.href)
+
           is_source_delete.node.after(node_sp)
 
-          node_sv = add_child("Source", nil, nil, node_sp)
+          node_sv = add_child("Source",
+                              namespace.prefix,
+                              namespace.href,
+                              node_sp)
+
           node_sv["type"] = k.type
           node_sv["name"] = k.name
           node_sv["href"] = k.href
 
-          node_lp = create_child("LocalityParams")
+          node_lp = create_child("LocalityParams",
+                                 namespace.prefix,
+                                 namespace.href)
+
           node_sv.after(node_lp)
 
-          node_re = add_child("ResourceEntity", nil, nil, node_lp)
+          node_re = add_child("ResourceEntity",
+                              namespace.prefix,
+                              namespace.href,
+                              node_lp)
+
           node_re["type"] = v.type
           node_re["name"] = v.name
           node_re["href"] = v.href

data/lib/cloud/vcloud/xml/wrapper_classes/recompose_vapp_wrapper.rb

@@ -26,13 +26,10 @@ module VCloudSdk
       def add_source_item(entity_to_add_href)
         return unless entity_to_add_href
 
-        prefix = namespace.prefix
-        prefix += ':' if prefix
-
-        node_sourced_item = create_child("#{prefix}SourcedItem")
+        node_sourced_item = create_child("SourcedItem", namespace.prefix, namespace.href)
         node_sourced_item["sourceDelete"] = "true"
 
-        node_source = add_child("#{prefix}Source", nil, nil, node_sourced_item)
+        node_source = add_child("Source", namespace.prefix, namespace.href, node_sourced_item)
         node_source["href"] = entity_to_add_href
 
         get_nodes("AllEULAsAccepted").first.node.before(node_sourced_item)

data/lib/cloud/vcloud/xml/wrapper_classes/virtual_hardware_section.rb

@@ -28,7 +28,8 @@ module VCloudSdk
       end
 
       def highest_instance_id
-        hardware.map{|h| h.instance_id}.max
+        ids = hardware.map{|h| h.get_rasd_content(RASD_TYPES[:INSTANCE_ID])}.compact
+        ids.map {|id| id.to_i}.max
       end
 
       def nics

data/lib/cloud/vcloud/xml/wrapper_classes/vm.rb

@@ -116,10 +116,15 @@ module VCloudSdk
         section.add_item(new_disk)
         # The order matters!
         new_disk.add_rasd(RASD_TYPES[:HOST_RESOURCE])
-        new_disk.add_rasd(RASD_TYPES[:INSTANCE_ID])
+
+        instance_id_type = RASD_TYPES[:INSTANCE_ID]
+        new_disk.add_rasd(instance_id_type)
+        new_disk.set_rasd(instance_id_type, section.highest_instance_id + 1)
+
         rt = RASD_TYPES[:RESOURCE_TYPE]
         new_disk.add_rasd(rt)
         new_disk.set_rasd(rt, HARDWARE_TYPE[:HARD_DISK])
+
         host_resource = new_disk.get_rasd(RASD_TYPES[:HOST_RESOURCE])
         host_resource[new_disk.create_qualified_name(
           "capacity", VCLOUD_NAMESPACE)] = size_mb.to_s

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.5.2
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,19 +104,19 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.6
-description: ! 'BOSH vCloud CPI
-
-  6c277e'
-email: vchs-cf@rbcon.com
+description: |-
+  BOSH vCloud CPI
+  5ea4fb
+email: support@cloudfoundry.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - lib/cloud/vcloud.rb
 - lib/cloud/vcloud/cache.rb
 - lib/cloud/vcloud/cloud.rb
@@ -396,30 +382,29 @@ files:
 - lib/cloud/vcloud/xml/xml_templates/VmPendingQuestion.xml
 - lib/cloud/vcloud/xml/xml_templates/VmQuestionAnswer.xml
 - lib/cloud/vcloud/xml/xml_templates/generate_dictionary.rb
-- README.md
-homepage: https://github.com/vchs/bosh_vcloud_cpi
+homepage: https://github.com/cloudfoundry/bosh
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: BOSH vCloud CPI
 test_files: []
+has_rdoc: