egon 0.0.2 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmZlZmNhYWE5YTk1ZDFlMTAyOTM0ODlmZGMxNjc5ZjZlZDg4ZGU1Zg==
+    OWZhMGUxMGU5NzAxYTJkYmNmYTQ2OThlMjIwMjcyYzdhNTA5OWUzOA==
   data.tar.gz: !binary |-
-    NjM0MzM5ZDdkYjk4MmNiN2U0NGQxZWZiZjU1ZWJmZDBkM2ZkMjNiNA==
+    MDMxZTQ0NTIxMGNjYmZjOGY1MzUyOWE4NTU2OGM0M2U0YmM2YzdhZQ==
 SHA512:
   metadata.gz: !binary |-
-    NTIzMDRhZGQ4ZjVlNzQzNmNkODZkNTBmYmZiNWVkZTE5ODU4MzE5ZmYxMDc5
-    YmU4ZTAzN2Y5M2I5MWU2MDIwNzRmMzM3MmFjMTQyZDFhMzBhMmY0NjZmNjE2
-    MWZhMTlkMzA5NGM1NjY5NmFmMDZlNjNjN2IyYjc5MDdjZjM0MmE=
+    MmNhYzZhY2FiOWNhNjQxYTMxN2NkMmFlN2MyNTU5ZGQ4NzBjODJlYzgwYWVk
+    YTE4NTE2YjgxMjA5ODkxMWM5YTc3ZWI2ZjA5ODg1ODA1OTNjMGJlZGQ2OWM3
+    ZDU5NDhkM2Q2NmVmYWVhNWNlOTEzOTcwMDljOGRkM2U3OTdmNzk=
   data.tar.gz: !binary |-
-    MGFjYTRiOWJkYmIxYzA1N2RiN2NiMDQ0ZTBhNzA3YjkyOGY5NDFmYTYxYzhj
-    NGYzMDZkNGFhMGU1ZDkzNzJkODk5NGVlZDlmYTI5NmJlNWI2MTllNDVmOTg0
-    YjY4YWNhMTE2MDRmNWViNzUzY2MwZGNmY2ZmZDJjZGY3ZjVjY2E=
+    ZWY2N2IxODFiMGEwNTMxYmY1OWM2ODJlYTNhYjcxY2IwYjAxNjY0YWVhZTIy
+    NTMwYjkyYTE3ZGJhZDA1Mzc1MDkzNWM1MzQ2YTNkYWZlODAxOThiZDFjNTkw
+    OGYwOWMxYmQyN2JlMTk3Y2QwMDIzYWMyODI1N2U3MTUxYTdmYjk=

data/egon.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", "~> 1.7"
   s.add_development_dependency "rake", "~> 10.0"
-  s.add_development_dependency "fog", "~> 1.29.0"
+  s.add_development_dependency "fog", "~> 1.31.0"
   s.add_development_dependency "net-ssh", "~> 2.9.2"
   s.add_development_dependency "rspec", "~> 3.2.0"
 end

data/lib/egon/overcloud/undercloud_handle/deployment.rb

@@ -4,33 +4,42 @@ module Overcloud
     def get_plan(plan_name)
       service('Planning').plans.find_by_name(plan_name)
     end
-    
+
     def edit_plan_parameters(plan_name, parameters)
       get_plan(plan_name).patch(:parameters => parameters)
     end
-    
+
     def edit_plan_deployment_role_count(plan_name, role_name, count)
       parameter = {"name" => role_name + "-1::count", "value" => count.to_s}
       edit_plan_parameters(plan_name, [parameter])
     end
-    
+
     def edit_plan_deployment_role_image(plan_name, role_name, image_uuid)
       parameter = {"name" => role_name + "-1::Image", "value" => image_uuid}
       edit_plan_parameters([parameter])
     end
-    
+
     def edit_plan_deployment_role_flavor(plan_name, role_name, flavor_name)
       parameter = {"name" => role_name + "-1::Flavor", "value" => flavor_name}
       edit_plan_parameters(plan_name, [parameter])
     end
-    
+
     def deploy_plan(plan_name)
       plan = get_plan(plan_name)
+      templates = Hash[plan.provider_resource_templates]
+      # temporary workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1212740
+      templates["manifests/overcloud_object.pp"] = templates["puppet/manifests/overcloud_object.pp"]
+      templates["manifests/ringbuilder.pp"] = templates["puppet/manifests/ringbuilder.pp"]
+      templates["manifests/overcloud_compute.pp"] = templates["puppet/manifests/overcloud_compute.pp"]
+      templates["manifests/overcloud_controller.pp"] = templates["puppet/manifests/overcloud_controller.pp"]
+      templates["manifests/overcloud_volume.pp"] = templates["puppet/manifests/overcloud_volume.pp"]
+      templates["manifests/overcloud_cephstorage.pp"] = templates["puppet/manifests/overcloud_cephstorage.pp"]
+
       stack_parameters = {
         :stack_name => plan.name,
         :template => plan.master_template,
         :environment => plan.environment,
-        :files => plan.provider_resource_templates,
+        :files => templates,
         :password => @password,
         :timeout_mins => 60,
         :disable_rollback => true

data/lib/egon/version.rb

@@ -1,3 +1,3 @@
 module Egon
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/egon.rb

@@ -1,5 +1,4 @@
 require "egon/version"
-require "egon/overcloud/undercloud_handle"
 
 module Egon
   # Your code goes here...

data/test/test_undercloud_handle.rb

@@ -0,0 +1,179 @@
+require 'fog'
+require 'fog/openstack/models/baremetal/nodes'
+require 'fog/openstack/models/compute/flavors'
+require 'fog/openstack/models/image/image'
+require 'fog/openstack/models/orchestration/stacks'
+require 'fog/openstack/models/planning/plans'
+require 'fog/openstack/models/planning/role'
+require './lib/egon/overcloud/undercloud_handle'
+
+describe "overcloud installation mocked" do
+  context "undercloud handle" do
+    before(:each) do
+      options = {
+        :openstack_username => 'user',
+        :openstack_tenant => 'tenant',
+        :openstack_auth_url => 'http://194.0.0.0'
+      }
+      @undercloud_handle = Overcloud::UndercloudHandle.new(options[:openstack_username], 'xxxxxxx', options[:openstack_auth_url])
+
+      # setup for mock image service
+      image_service = Fog::Image::OpenStack::Mock.new(options)
+      bm_deploy_kernel_image = Fog::Image::OpenStack::Image.new({
+        :id => '1',
+        :name => 'bm-deploy-kernel'
+      })
+      bm_deploy_ramdisk_image = Fog::Image::OpenStack::Image.new({
+        :id => '2',
+        :name => 'bm-deploy-ramdisk'
+      })
+      allow(image_service).to receive(:images).and_return([bm_deploy_kernel_image, bm_deploy_ramdisk_image])
+      allow(@undercloud_handle).to receive(:service).with('Image').and_return(image_service)
+
+      # setup for mock baremetal service
+      baremetal_service = Fog::Baremetal::OpenStack::Mock.new(options)
+      nodes = Fog::Baremetal::OpenStack::Nodes.new
+      node1 = Fog::Baremetal::OpenStack::Node.new({
+        'id' => '1',
+        'properties' => {
+           'cpus' => '1',
+           'memory_mb' => '4096',
+           'local_gb' => '40',
+           'cpu_arch' => 'x86_64'
+        },
+      })
+      node2 = Fog::Baremetal::OpenStack::Node.new({
+        'id' => '2',
+        'properties' => {
+           'cpus' => '1',
+           'memory_mb' => '5012',
+           'local_gb' => '40',
+           'cpu_arch' => 'x86_64'
+        },
+      })
+      allow(nodes).to receive(:details).and_return([node1, node2])
+      allow(baremetal_service).to receive(:nodes).and_return(nodes)
+      allow(@undercloud_handle).to receive(:service).with('Baremetal').and_return(baremetal_service)
+
+      # setup for mock compute service
+      compute_service = Fog::Compute::OpenStack::Mock.new(options)
+      flavors = Fog::Compute::OpenStack::Flavors.new
+      baremetal_flavor = Fog::Compute::OpenStack::Flavor.new({
+        'id' => '1',
+        'name' => 'baremetal',
+        'disk' => 40,
+        'ram' => 4096,
+        'vcpus' => 1,
+      })
+      allow(baremetal_flavor).to receive(:metadata).and_return({'cpu_arch' => 'x86_64'})
+      allow(flavors).to receive(:all).and_return([baremetal_flavor])
+      allow(flavors).to receive(:get).and_return(baremetal_flavor)
+      allow(compute_service).to receive(:flavors).and_return(flavors)
+      allow(@undercloud_handle).to receive(:service).with('Compute').and_return(compute_service)
+
+      # setup for mock planning service
+      planning_service = Fog::Openstack::Planning::Mock.new(options)
+      plans = Fog::Openstack::Planning::Plans.new
+      overcloud_plan = Fog::Openstack::Planning::Plan.new({
+        :uuid => '1',
+        :name => 'overcloud'
+      })
+      compute_role = Fog::Openstack::Planning::Role.new({
+        :uuid => '1',
+        :name => 'Compute'
+      })
+      controller_role = Fog::Openstack::Planning::Role.new({
+        :uuid => '1',
+        :name => 'Controller'
+      })
+      allow(planning_service).to receive(:roles).and_return([compute_role, controller_role])
+      allow(planning_service).to receive(:plans).and_return(plans)
+      allow(plans).to receive(:find_by_name).and_return(overcloud_plan)
+      allow(@undercloud_handle).to receive(:service).with('Planning').and_return(planning_service)
+
+      # setup for mock orchestration service
+      orchestration_service = Fog::Orchestration::OpenStack::Mock.new(options)
+      stacks = Fog::Orchestration::OpenStack::Stacks.new
+      overcloud_stack = Fog::Orchestration::OpenStack::Stack.new({
+        'id' => '1',
+        'name' => 'overcloud',
+      })
+      allow(stacks).to receive(:get).and_return(overcloud_stack)
+      allow(orchestration_service).to receive(:stacks).and_return(stacks)
+      allow(@undercloud_handle).to receive(:service).with('Orchestration').and_return(orchestration_service)
+    end
+
+    it "should be able to list_images" do
+      expect(@undercloud_handle.list_images.length).to eq 2
+    end
+
+    it "should be able to find_image_by_name" do
+      expect(@undercloud_handle.find_image_by_name('bm-deploy-kernel').id).to eq '1'
+    end
+
+    it "should be able to get_baremetal_deploy_kernel_image" do
+      expect(@undercloud_handle.find_image_by_name('bm-deploy-kernel').id).to eq '1'
+    end
+
+    it "should be able to get_baremetal_deploy_ramdisk_image" do
+      expect(@undercloud_handle.find_image_by_name('bm-deploy-ramdisk').id).to eq '2'
+    end
+
+    it "should be able to list_flavors" do
+      expect(@undercloud_handle.list_flavors.length).to eq 1
+    end
+
+    it "should be able to get_flavor" do
+      expect(@undercloud_handle.get_flavor('1').name).to eq 'baremetal'
+    end
+
+    it "should be able to get_flavor_extra_specs" do
+      expect(@undercloud_handle.get_flavor_extra_specs('1')['cpu_arch']).to eq 'x86_64'
+    end
+
+    it "should return true if flavor_exists? matches a flavor" do
+      flavor_parameters = {
+        :disk => 40,
+        :ram => 4096,
+        :vcpus => 1,
+        :extra_specs => {
+          :cpu_arch => 'x86_64'
+        }
+      }
+      expect(@undercloud_handle.flavor_exists?(flavor_parameters)).to be true
+    end
+
+    it "should return false if flavor_exists? does not match a flavor" do
+      flavor_parameters = {
+        :disk => 40,
+        :ram => 5012,
+        :vcpus => 1,
+        :extra_specs => {
+          :cpu_arch => 'x86_64'
+        }
+      }
+      expect(@undercloud_handle.flavor_exists?(flavor_parameters)).to be false
+    end
+
+    it "should not create_flavor_from_from_node if matching flavor exists" do
+      node = @undercloud_handle.list_nodes[0]
+      expect(@undercloud_handle.create_flavor_from_node(node)).to be_nil
+    end
+
+    it "should be able to list_nodes" do
+      expect(@undercloud_handle.list_nodes.length).to eq 2
+    end
+
+    it "should be able to list_deployment_roles" do
+      expect(@undercloud_handle.list_deployment_roles.length).to eq 2
+    end
+
+    it "should be able to get_plan" do
+      expect(@undercloud_handle.get_plan('overcloud').uuid).to eq '1'
+    end
+
+    it "should be able to get_stack" do
+      expect(@undercloud_handle.get_stack('overcloud').id).to eq '1'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Egon and Fusor team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.29.0
+        version: 1.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.29.0
+        version: 1.31.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ files:
 - rubygem-egon.spec
 - test/test_ssh_connection.rb
 - test/test_undercloud.rb
+- test/test_undercloud_handle.rb
 homepage: https://github.com/fusor/egon
 licenses:
 - GPL-3.0+
@@ -141,3 +142,4 @@ summary: A library on top of Fog that encapsulates TripleO deployment operations
 test_files:
 - test/test_ssh_connection.rb
 - test/test_undercloud.rb
+- test/test_undercloud_handle.rb