cbf 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    cbf (0.0.1)
-      nokogiri (~> 1.5.5)
+    cbf (0.0.2)
+      nokogiri (~> 1.5.0)
 
 GEM
   remote: http://rubygems.org/

data/cbf.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.homepage      = "https://github.com/tomassedovic/cbf"
   s.license       = 'Apache License, Version 2.0'
 
-  s.add_runtime_dependency "nokogiri", "~> 1.5.5"
+  s.add_runtime_dependency "nokogiri", "~> 1.5.0"
 
   s.add_development_dependency "rake", "~> 10.0.2"
 

data/lib/cbf/version.rb

@@ -1,3 +1,3 @@
 module CBF
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/cbf.rb

@@ -8,8 +8,8 @@ require 'generators/heat'
 
 module CBF
 
-  def self.convert(template, format)
-    template = parse(format, template)
+  def self.convert(template, format, options={})
+    template = parse(format, template, options)
     Convertor.new(template)
   end
 

data/lib/generators/heat.rb

@@ -52,6 +52,10 @@ module CBF
             },
           }
 
+          if resource.include? :key_name
+            resource_body['Properties']['KeyName'] = resolve_parameter_ref_or_value(name, resource[:key_name])
+          end
+
           files = template[:files].select { |f| f[:resource] == name }
           generated_files = files.map { |f| generate_file(f) }
 

data/lib/parsers/aeolus_v1.rb

@@ -16,15 +16,15 @@ module CBF
           end
           validate!(doc)
 
-          assemblies = (doc / 'assemblies/assembly').map { |a| parse_assembly(a)}
-          assembly_params = (doc / 'assemblies/assembly').map { |a| parse_assembly_parameters(a) }.flatten
+          assemblies = (doc / 'assemblies/assembly').map { |a| parse_assembly(a, options)}
+          assembly_params = (doc / 'assemblies/assembly').map { |a| parse_assembly_parameters(a, options) }.flatten
           resource_params = (doc / 'parameters/parameter').map { |el| parse_parameter(el) }
           {
             :name => doc.root.attr('name'),
             :description => (doc % 'description').text,
             :resources => assemblies,
             :services => (doc / 'services/service').map { |el| parse_service(el) },
-            :parameters => assembly_params +  resource_params,
+            :parameters => assembly_params + resource_params,
             :files => (doc / '//executable|//files/file').map { |el| parse_file(el, resource_params) },
             :outputs => (doc / 'assembly//return').map { |el| parse_return(el) },
           }
@@ -39,21 +39,29 @@ module CBF
           raise ValidationError unless errors.empty?
         end
 
-        def parse_assembly(assembly)
+        def parse_assembly(assembly, opts)
           name = assembly['name']
-          {
+          result = {
             :name => name,
             :type => :instance,
             :hardware_profile => {:parameter => 'hardware_profile'},
             :image => {:parameter => 'image'},
           }
+          if opts[:require_instance_keys]
+            result[:key_name] = {:parameter => 'key_name'}
+          end
+          return result
         end
 
-        def parse_assembly_parameters(assembly)
-          [
+        def parse_assembly_parameters(assembly, opts)
+          params = [
             assembly_parameter('image', assembly['name'], (assembly % 'image')['id']),
             assembly_parameter('hardware_profile', assembly['name'], assembly['hwp']),
           ]
+          if opts[:require_instance_keys]
+            params << assembly_parameter('key_name', assembly['name'], nil)
+          end
+          return params
         end
 
         def assembly_parameter(name, assembly_name, default_value)

data/spec/generators/heat_spec.rb

@@ -0,0 +1,69 @@
+# Copyright 2012 Red Hat, Inc.
+# Licensed under the Apache License, Version 2.0, see README for details.
+
+require 'spec_helper'
+require 'cbf'
+
+describe 'Heat generator' do
+  it "must produce a minimal Heat template" do
+    source = {
+      :description => 'sample template',
+      :parameters => [],
+      :resources => [],
+      :files => [],
+    }
+
+    template = CBF.generate(:heat, source)
+    template.wont_be_empty
+
+    parsed = JSON.parse(template)
+    parsed['Description'].must_equal(source[:description])
+    parsed.must_include 'Parameters'
+    parsed.must_include 'Resources'
+    parsed.must_include 'Outputs'
+  end
+
+  it "must specify required properties for instance resources" do
+    source = {
+      :description => 'sample template',
+      :parameters => [],
+      :resources => [{
+        :name => 'my instance',
+        :type => :instance,
+        :image => 'test-image-id',
+        :hardware_profile => 'test-hwp',
+      }],
+      :files => [],
+    }
+
+    t = JSON.parse(CBF.generate(:heat, source))
+    t['Resources'].must_include 'my instance'
+    t['Resources']['my instance'].must_include 'Properties'
+    properties = t['Resources']['my instance']['Properties']
+    properties.must_include 'ImageId'
+    properties['ImageId'].must_equal 'test-image-id'
+    properties.must_include 'InstanceType'
+    properties['InstanceType'].must_equal 'test-hwp'
+  end
+
+  it "must generate KeyName for instances when specified" do
+    source = {
+      :description => 'sample template',
+      :parameters => [],
+      :resources => [{
+        :name => 'my instance',
+        :type => :instance,
+        :image => 'test-image-id',
+        :hardware_profile => 'test-hwp',
+        :key_name => 'my-key'
+      }],
+      :files => [],
+    }
+
+    t = JSON.parse(CBF.generate(:heat, source))
+
+    properties = t['Resources']['my instance']['Properties']
+    properties.must_include 'KeyName'
+    properties['KeyName'].must_equal 'my-key'
+  end
+end

data/spec/parsers/aeolus_v1_spec.rb

@@ -60,4 +60,20 @@ describe 'Aeolus deployable version 1 parser' do
       CBF.parse(:aeolus_v1, '<deployable></deployable>')
     end.must_raise CBF::ValidationError
   end
+
+  it "must generate keyname parameters when asked to" do
+    deployable_path = "#{SAMPLES_PATH}/aeolus_v1/wordpress.xml"
+    result = CBF.parse(:aeolus_v1, open(deployable_path), {:require_instance_keys => true})
+
+    result[:parameters].must_include({:type => :string,
+      :name => 'key_name',:service => nil, :resource => 'webserver'})
+    result[:parameters].must_include({:type => :string,
+      :name => 'key_name', :service => nil, :resource => 'database'})
+
+    result[:resources][0].must_include :key_name
+    result[:resources][0][:key_name].must_equal({:parameter => 'key_name'})
+
+    result[:resources][1].must_include :key_name
+    result[:resources][1][:key_name].must_equal({:parameter => 'key_name'})
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cbf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,7 @@ files:
 - lib/generators/heat.rb
 - lib/parsers/aeolus_v1.rb
 - lib/parsers/aeolus_v1.rng.xml
+- spec/generators/heat_spec.rb
 - spec/parsers/aeolus_v1_spec.rb
 - spec/samples/aeolus_v1/drupal.xml
 - spec/samples/aeolus_v1/sample.xml
@@ -91,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2388046718038059094
+      hash: 289159412579649615
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -99,6 +100,7 @@ signing_key:
 specification_version: 3
 summary: Convert between various cloud deployment formats.
 test_files:
+- spec/generators/heat_spec.rb
 - spec/parsers/aeolus_v1_spec.rb
 - spec/samples/aeolus_v1/drupal.xml
 - spec/samples/aeolus_v1/sample.xml