Always use XML builders to construct XML

This removes the use of ERB to construct XML and instead always uses a
builder.

Author: ekohl

lib/fog/libvirt/models/compute/network.rb

@@ -27,6 +27,17 @@ def save
         def shutdown
           service.destroy_network(uuid)
         end
+
+        def to_xml
+          builder = Nokogiri::XML::Builder.new do |xml|
+            xml.network do
+              xml.name(name)
+              xml.bridge(:name => bridge_name, :stp => 'on', :delay => '0')
+            end
+          end
+
+          builder.to_xml
+        end
       end
     end
   end

lib/fog/libvirt/models/compute/pool.rb

@@ -78,6 +78,20 @@ def persistent?
         def volumes
           service.list_pool_volumes uuid
         end
+
+        def to_xml
+          builder = Nokogiri::XML::Builder.new do |xml|
+            xml.pool(:type => 'dir') do
+              xml.name(name)
+
+              xml.target do
+                xml.path(path)
+              end
+            end
+          end
+
+          builder.to_xml
+        end
       end
     end
   end

lib/fog/libvirt/models/compute/templates/network.xml.erb

@@ -16,14 +16,6 @@ def xml_elements(xml, path, attribute=nil)
         attribute.nil? ? (xml/path).map : (xml/path).map{|element| element[attribute.to_sym]}
       end
 
-      def to_xml template_name = nil
-        # figure out our ERB template filename
-        erb = template_name || self.class.to_s.split("::").last.downcase
-        path     = File.join(File.dirname(__FILE__), "..", "templates", "#{erb}.xml.erb")
-        template = File.read(path)
-        ERB.new(template, nil, '-').result(binding)
-      end
-
       def randomized_name
         "fog-#{(SecureRandom.random_number*10E14).to_i.round}"
       end

lib/fog/libvirt/models/compute/templates/volume.xml.erb

@@ -79,6 +79,47 @@ def upload_image(file_path)
           service.upload_volume(pool_name, name, file_path)
         end
 
+        def to_xml
+          builder = Nokogiri::XML::Builder.new do |xml|
+            xml.volume do
+              xml.name(name)
+
+              allocation_size, allocation_unit = split_size_unit(allocation)
+              xml.allocation(allocation_size, :unit => allocation_unit)
+
+              capacity_size, capacity_unit = split_size_unit(capacity)
+              xml.capacity(capacity_size, :unit => capacity_unit)
+
+              xml.target do
+                xml.format(:type => format_type)
+
+                xml.permissions do
+                  xml.owner(owner) if owner
+                  xml.group(group) if group
+                  xml.mode('0744')
+                  xml.label('virt_image_t')
+                end
+              end
+
+              if backing_volume
+                xml.backingStore do
+                  xml.path(backing_volume.path)
+                  xml.format(:type => backing_volume.format_type)
+
+                  xml.permissions do
+                    xml.owner(owner) if owner
+                    xml.group(group) if group
+                    xml.mode('0744')
+                    xml.label('virt_image_t')
+                  end
+                end
+              end
+            end
+          end
+
+          builder.to_xml
+        end
+
         private
 
         def image_suffix

lib/fog/libvirt/models/compute/util/util.rb

@@ -30,12 +30,14 @@
 
   tests("to_xml") do
     test("default") do
-      begin
-        network.to_xml
-        false
-      rescue NameError # forward_mode is undefined
-        true
-      end
+      expected = <<~NETWORK
+        <?xml version="1.0"?>
+        <network>
+          <name>default</name>
+          <bridge name="virbr0" stp="on" delay="0"/>
+        </network>
+      NETWORK
+      network.to_xml == expected
     end
   end
 end

lib/fog/libvirt/models/compute/volume.rb

@@ -38,18 +38,19 @@
   test('to_xml') do
     test('default') do
       expected = <<~VOLUME
+        <?xml version="1.0"?>
         <volume>
-                <name>fog_test</name>
-                <allocation unit="G">1</allocation>
-                <capacity unit="G">10</capacity>
-                <target>
-                  <format type="raw"/>
-                  <permissions>
-                                            <mode>0744</mode>
-                    <label>virt_image_t</label>
-                  </permissions>
-                </target>
-                </volume>
+          <name>fog_test</name>
+          <allocation unit="G">1</allocation>
+          <capacity unit="G">10</capacity>
+          <target>
+            <format type="raw"/>
+            <permissions>
+              <mode>0744</mode>
+              <label>virt_image_t</label>
+            </permissions>
+          </target>
+        </volume>
       VOLUME
       volume.to_xml == expected
     end