bosh_vcloud_cpi 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c5d94e5c6e04f3c4c4278102318721310992985
-  data.tar.gz: 87e9ec2ac54d8ed07b5c19d2f6b1fda889158fa9
+  metadata.gz: 631972cbe9ebb1d34753f50afa184b2e0f99f5b7
+  data.tar.gz: 4afd0a8fe7f88e48ece8ed491873e89a0c804528
 SHA512:
-  metadata.gz: 0248558f421c4433ce1bf5cf5d93ffb03f4fa81736d3bb0669de0dc11b76445dced85cbc51d5a932ae9f24f7f7e58e7c6b69a41190d90857fd54f58ecef864f7
-  data.tar.gz: a9df0812cc617f95f9fae56c1c3cb9a62b4bb42b87980334d3ad8ccc8b459d383f39862f403f48a07f034f1a7a8d96548aa65b482e3d96be55e30a986deddd04
+  metadata.gz: dba493026be365861d5871760c420234e48658b6deec07bb787c50a10fd1fe4333fb38542df6363641f4b345aa804210fb4c7c43e335464570e5a0c1ee48e5a2
+  data.tar.gz: 33bab3c5429fdf91eed0caa1a10f2d28e9734500df1d4f0db8908a53786180d60c475defb1ea16df3433fdee2a3e2a4cac53c7c282a1bca8cf0dbc3f8ccb9c06

data/lib/cloud/vcloud/cloud.rb

@@ -31,6 +31,7 @@ module VCloudCloud
         s.next Steps::StemcellInfo, image
         s.next Steps::CreateTemplate, "sc-#{unique_name}"
         s.next Steps::UploadTemplateFiles
+        s.next Steps::AddCatalog, @client.catalog_name(:vapp)
         s.next Steps::AddCatalogItem, :vapp, s.state[:vapp_template]
       end)[:catalog_item].urn
     end

data/lib/cloud/vcloud/steps.rb

@@ -77,6 +77,7 @@ require_relative 'steps/stemcell_info'
 require_relative 'steps/create_template'
 require_relative 'steps/create_media'
 require_relative 'steps/upload_template_files'
+require_relative 'steps/add_catalog'
 require_relative 'steps/add_catalog_item'
 require_relative 'steps/instantiate'
 require_relative 'steps/recompose'

data/lib/cloud/vcloud/steps/add_catalog.rb

@@ -0,0 +1,35 @@
+module VCloudCloud
+  module Steps
+    class AddCatalog < Step
+      def perform(name, &block)
+        catalog = VCloudSdk::Xml::WrapperFactory.create_instance 'AdminCatalog'
+        catalog.name = name
+        link = client.org.add_catalog_link
+        begin
+          result = client.invoke :post,
+                                 link,
+                                 :payload => catalog,
+                                 :headers => { :content_type => link.type }
+          state[:catalog] = client.wait_entity result
+          client.flush_cache
+        rescue RestClient::BadRequest
+          # check if catalog already exists; if so, this is not an error
+          client.flush_cache
+          catalog = client.org.catalog_link(name)
+          if catalog
+            return catalog
+          end
+          raise
+        end
+      end
+
+      def rollback
+        catalog = state[:catalog]
+        return unless catalog
+
+        client.invoke :delete, catalog
+        state.delete :catalog
+      end
+    end
+  end
+end

data/lib/cloud/vcloud/vcd_client.rb

@@ -61,9 +61,13 @@ module VCloudCloud
       end
     end
 
-    # catalog should be either :vapp or :media
+    # catalog_type should be either :vapp or :media
+    def catalog_name(catalog_type)
+      @entities["#{catalog_type.to_s}_catalog"]
+    end
+
     def catalog(catalog_type)
-      catalog_link = org.catalog_link @entities["#{catalog_type.to_s}_catalog"]
+      catalog_link = org.catalog_link catalog_name(catalog_type)
       raise ObjectNotFoundError, "Invalid catalog type: #{catalog_type}" unless catalog_link
       resolve_link catalog_link
     end

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

@@ -96,6 +96,10 @@ module VCloudSdk
         @root["name"]
       end
 
+      def name=(name)
+        @root["name"] = name
+      end
+
       def urn
         @root["id"]
       end

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

@@ -14,7 +14,19 @@ module VCloudSdk
           get_nodes("CatalogItem")
         end
       end
-    end
 
+      def running_tasks
+        tasks.find_all {|t| RUNNING.include?(t.status)}
+      end
+
+      def tasks
+        get_nodes("Task")
+      end
+
+      private
+
+      RUNNING = [TASK_STATUS[:RUNNING], TASK_STATUS[:QUEUED],
+                 TASK_STATUS[:PRE_RUNNING]]
+    end
   end
 end

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

@@ -16,6 +16,17 @@ module VCloudSdk
                     "name" => name},
                   true).first
       end
+
+      def add_catalog_link
+        link = get_nodes("Link",
+                         {"rel" => "add",
+                          "type" => ADMIN_MEDIA_TYPE[:ADMIN_CATALOG]},
+                         true).first
+        if !link
+          raise "Couldn't find add catalog link in #{@root}"
+        end
+        return link
+      end
     end
   end
 end

data/lib/cloud/vcloud/xml/xml_templates/AdminCatalog.xml

@@ -1 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns7:AdminCatalog xmlns="http://www.vmware.com/vcloud/extension/v1" xmlns:ns2="http://www.vmware.com/vcloud/v1" xmlns:ns3="http://schemas.dmtf.org/ovf/envelope/1" xmlns:ns4="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:ns5="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:ns6="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ns7="http://www.vmware.com/vcloud/v1.5" xmlns:ns8="http://schemas.dmtf.org/ovf/environment/1" xmlns:ns9="http://www.vmware.com/vcloud/extension/v1.5" xmlns:ns10="http://www.vmware.com/vcloud/versions" name="" id="" type="" href=""><ns7:Description></ns7:Description><ns7:Tasks/><ns7:Owner/><ns7:CatalogItems/><ns7:IsPublished>false</ns7:IsPublished></ns7:AdminCatalog>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<AdminCatalog
+        xmlns="http://www.vmware.com/vcloud/v1.5"
+        name="">
+  <Description></Description>
+</AdminCatalog>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -124,7 +124,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH vCloud CPI
-  7d1662
+  697696
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -137,6 +137,7 @@ files:
 - lib/cloud/vcloud/errors.rb
 - lib/cloud/vcloud/file_uploader.rb
 - lib/cloud/vcloud/steps.rb
+- lib/cloud/vcloud/steps/add_catalog.rb
 - lib/cloud/vcloud/steps/add_catalog_item.rb
 - lib/cloud/vcloud/steps/add_networks.rb
 - lib/cloud/vcloud/steps/attach_detach_disk.rb
@@ -416,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: BOSH vCloud CPI