Merge pull request #2603 from DennisAhausSAP/extend-bosh-tagging

Extend bosh tagging for cpi

Author: Joseph Palermo

src/bosh-director/lib/bosh/director/jobs/update_stemcell.rb

@@ -109,7 +109,8 @@ def perform
             upload_suffix = ' (already exists, skipped)' unless needs_upload
             track_and_log("Uploading stemcell #{@name}/#{@version} to the cloud#{cpi_suffix}#{upload_suffix}") do
               if needs_upload
-                stemcell.cid = cloud.create_stemcell(@stemcell_image, @cloud_properties)
+                tags = get_tags()
+                stemcell.cid = cloud.create_stemcell(@stemcell_image, @cloud_properties, {"tags" => tags})
                 logger.info("Cloud created stemcell#{cpi_suffix}: #{stemcell.cid}")
               else
                 logger.info("Skipping stemcell upload, already exists#{cpi_suffix}")
@@ -146,6 +147,21 @@ def perform
 
       private
 
+      def get_tags()
+        tags = {}
+        runtime_configs = Bosh::Director::Api::RuntimeConfigManager.new.list(1, "default")
+        if !runtime_configs.nil?
+          raw = runtime_configs[0]
+          if !raw.nil? 
+            hash = raw.to_hash
+            if !hash.nil? && !hash["tags"].nil?
+              tags.merge!(hash["tags"])
+            end
+          end
+        end
+        return tags
+      end
+
       def verify_sha1
         @multi_digest_verifier.verify(@stemcell_path, @stemcell_sha1)
       rescue Bosh::Director::BoshDigest::ShaMismatchError => e

src/bosh-director/lib/clouds/external_cpi_response_wrapper.rb

@@ -9,7 +9,6 @@ def initialize(cpi, cpi_api_version)
     end
 
     def current_vm_id(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
-    def create_stemcell(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
     def delete_stemcell(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
     def delete_vm(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
     def create_network(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
@@ -50,6 +49,16 @@ def create_vm(*args)
       response
     end
 
+
+    def create_stemcell(*args) 
+      final_args = args.take(2)
+      if @cpi_api_version >= 3
+        final_args = args
+      end
+      return  @cpi.create_stemcell(*final_args)
+    end
+
+
     def attach_disk(*args)
       cpi_response = @cpi.attach_disk(*args)
 

src/bosh-director/spec/unit/bosh/director/jobs/update_stemcell_spec.rb

@@ -44,15 +44,28 @@
                          tar.add_file('stemcell.MF', mode: '0644', mtime: 0) { |os, _| os.write(manifest.to_yaml) }
                          tar.add_file('image', mode: '0644', mtime: 0) { |os, _| os.write(stemcell_image_content) }
                        end
-
                        io.close
                      end.string
                    ),
         )
       end
     end
 
+
+    let(:runtime_config_manager) { instance_double(Bosh::Director::Api::RuntimeConfigManager) }
+    let(:config) { instance_double(Bosh::Director::Models::Config) }
+    let(:runtime_config_list) do
+      [config]
+    end
+
     before do
+
+      allow(Bosh::Director::Api::RuntimeConfigManager).to receive(:new).and_return(runtime_config_manager)
+      allow(Bosh::Director::Models::Config).to receive(:new).and_return(config)
+      allow(config).to receive(:to_hash).and_return({"tags" => {"any"=> "value"}})
+      allow(runtime_config_manager).to receive(:list).with(1, 'default').and_return(runtime_config_list)
+
+
       allow(Bosh::Director::Config).to receive(:event_log).and_return(event_log)
       allow(Bosh::Director::Config).to receive(:uuid).and_return('meow-uuid')
       allow(Bosh::Director::Config).to receive(:cloud_options).and_return({'provider' => {'path' => '/path/to/default/cpi'}})
@@ -61,6 +74,7 @@
                                                              'meow-uuid',
                                                              instance_of(Logging::Logger),
                                                              stemcell_api_version: nil).and_return(cloud)
+
       allow(cloud).to receive(:request_cpi_api_version=)
       allow(cloud).to receive(:info).and_return('stemcell_formats' => ['dummy'])
 
@@ -319,9 +333,9 @@
           expect(cloud3).to receive(:info).and_return('stemcell_formats' => ['dummy'])
 
           expect(cloud_factory).to receive(:all_names).exactly(3).times.and_return(%w[cloud1 cloud2 cloud3])
-          expect(cloud_factory).to receive(:get).with('cloud1').and_return(cloud1)
-          expect(cloud_factory).to receive(:get).with('cloud2').and_return(cloud2)
-          expect(cloud_factory).to receive(:get).with('cloud3').and_return(cloud3)
+          expect(cloud_factory).to receive(:get).with('cloud1').and_return(Bosh::Clouds::ExternalCpiResponseWrapper.new(cloud1, 1))
+          expect(cloud_factory).to receive(:get).with('cloud2').and_return(Bosh::Clouds::ExternalCpiResponseWrapper.new(cloud2, 1))
+          expect(cloud_factory).to receive(:get).with('cloud3').and_return(Bosh::Clouds::ExternalCpiResponseWrapper.new(cloud3, 1))
 
           expected_steps = 11
           expect(event_log).to receive(:begin_stage).with('Update stemcell', expected_steps)
@@ -369,7 +383,7 @@
         it 'skips creating a stemcell match when a CPI fails' do
           expect(cloud1).to receive(:create_stemcell).with(anything, { 'ram' => '2gb' }).and_raise('I am flaky')
           expect(cloud1).to receive(:info).and_return('stemcell_formats' => ['dummy'])
-          expect(cloud_factory).to receive(:get).with('cloud1').and_return(cloud1)
+          expect(cloud_factory).to receive(:get).with('cloud1').and_return(Bosh::Clouds::ExternalCpiResponseWrapper.new(cloud1, 1))
           expect(cloud_factory).to receive(:all_names).exactly(3).times.and_return(['cloud1'])
 
           expect { subject.perform }.to raise_error 'I am flaky'
@@ -385,9 +399,9 @@
 
           it 'creates one stemcell and one stemcell match per cpi' do
             expect(cloud_factory).to receive(:all_names).exactly(3).times.and_return(%w[cloud1 cloud2 cloud3])
-            expect(cloud_factory).to receive(:get).with('cloud1').and_return(cloud1)
-            expect(cloud_factory).to receive(:get).with('cloud2').and_return(cloud2)
-            expect(cloud_factory).to receive(:get).with('cloud3').and_return(cloud3)
+            expect(cloud_factory).to receive(:get).with('cloud1').and_return(Bosh::Clouds::ExternalCpiResponseWrapper.new(cloud1, 1))
+            expect(cloud_factory).to receive(:get).with('cloud2').and_return(Bosh::Clouds::ExternalCpiResponseWrapper.new(cloud2, 1))
+            expect(cloud_factory).to receive(:get).with('cloud3').and_return(Bosh::Clouds::ExternalCpiResponseWrapper.new(cloud3, 1))
 
             expect(cloud1).to receive(:info).and_return('stemcell_formats' => ['dummy'])
             expect(cloud2).to receive(:info).and_return('stemcell_formats' => ['dummy1'])
@@ -423,7 +437,7 @@
 
           expect(cloud_factory).to receive(:get_cpi_aliases).with('').and_return([''])
           expect(cloud_factory).to receive(:all_names).exactly(3).times.and_return([''])
-          expect(cloud_factory).to receive(:get).with('').and_return(cloud)
+          expect(cloud_factory).to receive(:get).with('').and_return(Bosh::Clouds::ExternalCpiResponseWrapper.new(cloud, 1))
 
           expected_steps = 5
           expect(event_log).to receive(:begin_stage).with('Update stemcell', expected_steps)

src/bosh-director/spec/unit/clouds/external_cpi_response_wrapper_spec.rb

@@ -358,6 +358,25 @@ def self.it_raises_an_error_with_ok_to_retry(error_class)
     end
   end
 
+  describe 'when cpi_version is >= 3' do
+    let(:cpi_api_version) { 3 }
+    let(:config) { double('Bosh::Director::Config', logger: logger, cpi_task_log: cpi_log_path, preferred_cpi_api_version: 3) }
+    
+    describe '#create_stemcell' do
+
+    let(:cpi_response) { JSON.dump(result: 'fake-result', error: nil, log: 'fake-log') }
+    let(:expected_response) { 'fake-result' }
+
+    it_calls_cpi_method(
+        :create_stemcell,
+        'fake-stemcell-cid',
+        { 'cloud' => 'props' },
+        { 'tags' => {"any": "value"} }
+      )
+
+    end
+  end
+
   describe 'when cpi_version is 2' do
     let(:cpi_api_version) { 2 }