Fix properties in glance_image provider for osc >= 4.0.0

Similar to I6a68505d15473b140c85a199a09d2fee45864800

Openstackclient 4.0.0 changed the way some properties are displayed
on screen.

Old:
...,"Properties"
...,"foo='bar'"

New:
...,"Properties"
...,"{u'foo': u'bar'}"
or
...,"{'foo': 'bar'}"

This is breaking idempotency on the glance_image provider, since it
does not detect them correctly. This patch aims at fixing this, by
trying to detect the new format, and using JSON parsing in that case.

Change-Id: I1829c7e59058fa72690dc08b3e2f65afcad7ea46
(cherry picked from commit 1365358978)

lib/puppet/provider/glance_image/openstack.rb

@@ -135,7 +135,7 @@ Puppet::Type.type(:glance_image).provide(
     list = request('image', 'list', '--long')
     list.collect do |image|
       attrs = request('image', 'show', image[:id])
-      properties = Hash[attrs[:properties].scan(/(\S+)='([^']*)'/)] rescue nil
+      properties = parsestring(attrs[:properties]) rescue nil
       new(
         :ensure           => :present,
         :name             => attrs[:name],
@@ -195,4 +195,22 @@ Puppet::Type.type(:glance_image).provide(
       ['--property', "#{k}=#{v}"] unless hidden.include?(k)
     }.compact
   end
+
+  def self.string2hash(input)
+    return Hash[input.scan(/(\S+)='([^']*)'/)]
+  end
+
+  def self.pythondict2hash(input)
+    return JSON.parse(input.gsub(/u'(\w*)'/, '"\1"').gsub(/'/, '"').gsub(/False/,'false').gsub(/True/,'true'))
+  end
+
+  def self.parsestring(input)
+    if input[0] == '{'
+      # 4.0.0+ output, python dict
+      return self.pythondict2hash(input)
+    else
+      # Pre-4.0.0 output, key=value
+      return self.string2hash(input)
+    end
+  end
 end

spec/acceptance/basic_glance_spec.rb

@@ -38,7 +38,7 @@ describe 'glance class' do
           expect(r.stdout).to match(/visibility="public"/)
           expect(r.stdout).to match(/container_format="bare"/)
           expect(r.stdout).to match(/disk_format="qcow2"/)
-          expect(r.stdout).to include('properties="icanhaz=\'cheezburger\'')
+          expect(r.stdout).to match(/properties=.*icanhaz.*cheezburger/)
           expect(r.stdout).to match(/min_ram="64"/)
           expect(r.stdout).to match(/min_disk="1024"/)
         end

spec/unit/provider/glance_image_spec.rb

@@ -76,6 +76,35 @@ visibility="public"
 
     end
 
+    describe '#pythondict2hash' do
+      it 'should return a hash with key-value when provided with a unicode python dict' do
+        s = "{u'key': 'value', u'key2': 'value2'}"
+        expect(provider_class.pythondict2hash(s)).to eq({"key"=>"value", "key2"=>"value2"})
+      end
+
+      it 'should return a hash with key-value when provided with a python dict' do
+        s = "{'key': 'value', 'key2': 'value2'}"
+        expect(provider_class.pythondict2hash(s)).to eq({"key"=>"value", "key2"=>"value2"})
+      end
+
+      it 'should convert boolean to json compatible hash when provided with a python dict' do
+        s = "{'key': 'value', 'key2': False}"
+        expect(provider_class.pythondict2hash(s)).to eq({"key"=>"value", "key2"=>false})
+      end
+    end
+
+    describe '#parsestring' do
+      it 'should call string2hash when provided with a string' do
+        s = "key='value', key2='value2'"
+        expect(provider_class.parsestring(s)).to eq({"key"=>"value", "key2"=>"value2"})
+      end
+
+      it 'should call pythondict2hash when provided with a hash' do
+        s = "{u'key': 'value', u'key2': 'value2'}"
+        expect(provider_class.parsestring(s)).to eq({"key"=>"value", "key2"=>"value2"})
+      end
+    end
+
     describe '.instances' do
       it 'finds every image' do
         provider.class.stubs(:openstack)