shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-27 13:57:23 +03:00
Code Releases Wiki Activity

feature #3471: Code formatting

Browse Source
This commit is contained in:
Ruben S. Montero 2015-01-30 13:56:06 +01:00
parent 1f73e7c61d
commit 0e4f456f70
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Vdc.h
View File

@ -41,8 +41,9 @@ public:
* Writes the ResourceSet in XML form the the given stream, in the form: * Writes the ResourceSet in XML form the the given stream, in the form:
* <RESOURCE> * <RESOURCE>
* <ZONE_ID> * <ZONE_ID>
* <RESOURC_ID> * <RESOURCE_ID>
* </RESOURCE> * </RESOURCE>
* RESOURCE is set from xml_name attribute.
* @param oss the outpur string stream * @param oss the outpur string stream
*/ */
void to_xml(ostringstream &oss) const; void to_xml(ostringstream &oss) const;

1
src/cli/one_helper/onevdc_helper.rb
View File

@ -111,7 +111,6 @@ class OneVdcHelper < OpenNebulaHelper::OneHelper
groups = vdc_hash['VDC']['GROUPS']['ID'] groups = vdc_hash['VDC']['GROUPS']['ID']
if(groups != nil) if(groups != nil)
puts puts
#CLIHelper.print_header(str_h1 % "GROUPS", false)
CLIHelper::ShowTable.new(nil, self) do CLIHelper::ShowTable.new(nil, self) do
column :"GROUPS", "", :right, :size=>7 do |d| column :"GROUPS", "", :right, :size=>7 do |d|

3
src/vdc/Vdc.cc
View File

@ -462,14 +462,13 @@ int ResourceSet::from_xml_node(vector<xmlNodePtr>& content)
int zone_id, id; int zone_id, id;
string zone_path = "/" + xml_name + "/ZONE_ID"; string zone_path = "/" + xml_name + "/ZONE_ID";
string resource_path = "/" + xml_name + "/" + xml_name + "_ID"; string resource_path = "/" + xml_name + "/" + xml_name + "_ID";
for (it = content.begin(); it != content.end(); it++) for (it = content.begin(); it != content.end(); it++)
{ {
ObjectXML tmp_xml(*it); ObjectXML tmp_xml(*it);
rc += tmp_xml.xpath(zone_id, zone_path.c_str(), -1); rc += tmp_xml.xpath(zone_id, zone_path.c_str(), -1);
rc += tmp_xml.xpath(id, resource_path.c_str(), -1); rc += tmp_xml.xpath(id, resource_path.c_str(), -1);