Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Remove to_xml #430

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions app/models/miq_ae_datastore.rb
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,6 @@ def self.export(tenant)
temp_export.unlink
end

def self.export_class(namespace, class_name)
XmlExport.class_to_xml(namespace, class_name)
end

def self.export_namespace(namespace)
XmlExport.namespace_to_xml(namespace)
end

def self.reset
_log.info("Clearing datastore")
[MiqAeClass, MiqAeField, MiqAeInstance, MiqAeNamespace, MiqAeMethod, MiqAeValue].each(&:delete_all)
Expand Down
60 changes: 0 additions & 60 deletions app/models/miq_ae_datastore/xml_export.rb

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@ def self.miq_log_object(obj, _inputs)
$miq_ae_logger.info("===========================================")
end

def self.miq_log_workspace(obj, _inputs)
$miq_ae_logger.info("===========================================")
$miq_ae_logger.info("Dumping Workspace")
$miq_ae_logger.info(obj.workspace.to_expanded_xml)
$miq_ae_logger.info("===========================================")
end

def self.miq_send_email(_obj, inputs)
MiqAeMethodService::MiqAeServiceMethods.send_email(inputs["to"], inputs["from"], inputs["subject"], inputs["body"], :cc => inputs["cc"], :bcc => inputs["bcc"], :content_type => inputs["content_type"])
end
Expand Down
41 changes: 0 additions & 41 deletions lib/miq_automation_engine/engine/miq_ae_engine/miq_ae_object.rb
Original file line number Diff line number Diff line change
Expand Up @@ -186,47 +186,6 @@ def state_machine?
@aec.state_machine?
end

def attribute_value_to_xml(value, xml)
case value.class.to_s
when 'MiqAePassword' then xml.Password(OPAQUE_PASSWORD)
when 'String' then xml.String(value)
when 'Fixnum' then xml.Fixnum(value)
when 'Symbol' then xml.Symbol(value.to_s)
when 'TrueClass', 'FalseClass' then xml.Boolean(value.to_s)
when /MiqAeMethodService::(.*)/ then xml.tag!($1.gsub(/::/, '-'), :object_id => value.object_id, :id => value.id)
when 'Array'
xml.Array do
value.each_index do |i|
xml.Element(:index => i + 1) { attribute_value_to_xml(value[i], xml) }
end
end
when 'Hash'
xml.Hash do
value.each do |k, v|
xml.Key(:name => k.to_s) { attribute_value_to_xml(v, xml) }
end
end
when 'DRb::DRbUnknown'
$miq_ae_logger.error("Found DRbUnknown for value: #{value.inspect} in XML: #{xml.inspect}")
xml.String(value)
else
xml.tag!(value.class.to_s.gsub(/::/, '-')) { xml.cdata!(value.inspect) }
end
end

def to_xml(options = {})
require 'builder'
xml = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
xml_attrs = {:namespace => @namespace, :class => @klass, :instance => @instance}
xml.MiqAeObject(xml_attrs) do
@attributes.keys.sort.each do |k|
xml.MiqAeAttribute(:name => k) { attribute_value_to_xml(@attributes[k], xml) }
end

children.each { |c| c.to_xml(:builder => xml) }
end
end

def fields(message = nil)
@fields_ordered.collect do |fname|
@fields[fname] if message.nil? || self.class.message_matches?(message_parse(@fields[fname]['message']), message)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,25 +191,6 @@ def pop_state_machine_info
reset_state_info(@state_machine_objects.last) unless @state_machine_objects.empty?
end

def to_expanded_xml(path = nil)
objs = path.nil? ? roots : get_obj_from_path(path)
objs = [objs] unless objs.kind_of?(Array)

require 'builder'
xml = Builder::XmlMarkup.new(:indent => 2)
xml.MiqAeWorkspace do
objs.each { |obj| obj.to_xml(:builder => xml) }
end
end

def to_xml(path = nil)
objs = path.nil? ? roots : get_obj_from_path(path)
result = objs.collect { |obj| to_hash(obj) }.compact
s = ""
XmlHash.from_hash({"MiqAeObject" => result}, {:rootname => "MiqAeWorkspace"}).to_xml.write(s, 2)
s
end

def to_dot(path = nil)
require "rubygems"
require "graphviz"
Expand Down
17 changes: 0 additions & 17 deletions spec/miq_ae_object_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,6 @@
MiqAeDatastore.reset
end

it "#to_xml" do
args = {'nil_arg' => nil, 'float_arg' => 5.98,
'int_arg' => 10, 'string_arg' => 'Stringy',
'svc_vm' => MiqAeMethodService::MiqAeServiceManageIQ_Providers_Vmware_InfraManager_Vm.find(@vm.id)}

@miq_obj.process_args_as_attributes(args)
validate_xml(@miq_obj.to_xml, args)
end

def validate_xml(xml, args)
hash = Hash.from_xml(xml)
attrs = hash['MiqAeObject']['MiqAeAttribute']
args.each do |key, value|
expect(find_match(attrs, key, value)).to be_truthy
end
end

def find_match(attrs, key, value)
item = attrs.detect { |i| i['name'] == key }
return false unless item
Expand Down
66 changes: 0 additions & 66 deletions spec/models/miq_ae_datastore/xml_export_spec.rb

This file was deleted.