Revision 2911648e

View differences:

src/onedb/local/4.90.0_to_5.3.80.rb
126 126

  
127 127
                    capacity = doc.create_element("CAPACITY")
128 128
                    host_info["capacity"].each { |k, v|
129
                        name = k[0..1] << k[3..k.length-1]
129
                        name = k.gsub(".", "_")
130 130
                        capacity.add_child(doc.create_element(name.upcase, v))
131 131
                    }
132 132

  
src/vmm_mad/remotes/ec2/ec2_driver.rb
454 454
    # Parse template instance type into
455 455
    # Amazon ec2 format (M1SMALL => m1.small)
456 456
    def parse_inst_type(type)
457
        fixed_type = type[0..1]<< '.' << type[2..type.length+1]
458
        return fixed_type.downcase
457
        return type.downcase.gsub("_", ".")
459 458
    end
460 459

  
461 460
    # Get the info of all the EC2 instances. An EC2 instance must include

Also available in: Unified diff