From 4b08d76fbfa7e6b789c97fe4e726cfaa57e896f3 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 1 Jul 2015 15:15:40 -0400 Subject: [PATCH] Whitespace cleanup --- include/ActionManager.h | 6 +- include/Attribute.h | 12 +- include/DispatchManager.h | 34 +- include/HookManagerDriver.h | 4 +- include/Host.h | 10 +- include/Image.h | 2 +- include/LifeCycleManager.h | 8 +- include/Nebula.h | 50 +-- include/OneClient.h | 188 +++++------ include/RequestManagerChmod.h | 8 +- include/RequestManagerChown.h | 6 +- include/SyncRequest.h | 4 +- include/Template.h | 8 +- include/TransferManager.h | 6 +- include/UserTemplate.h | 2 +- include/VMTemplate.h | 4 +- include/Vdc.h | 26 +- include/VirtualMachine.h | 8 +- include/VirtualMachineHook.h | 4 +- include/VirtualMachineManagerDriver.h | 18 +- include/XMLDriver.h | 4 +- include/XenDriver.h | 4 +- src/authm_mad/one_auth_mad.rb | 24 +- src/authm_mad/remotes/plain/authenticate | 2 +- .../server_cipher/server_cipher_auth.rb | 28 +- .../remotes/server_x509/authenticate | 2 +- .../remotes/server_x509/server_x509_auth.conf | 2 +- src/authm_mad/remotes/ssh/authenticate | 4 +- src/authm_mad/remotes/x509/authenticate | 2 +- src/cli/etc/oneacct.yaml | 2 +- src/cli/etc/oneacl.yaml | 16 +- src/cli/etc/onecluster.yaml | 8 +- src/cli/etc/onegroup.yaml | 8 +- src/cli/etc/onehost.yaml | 24 +- src/cli/etc/oneimage.yaml | 24 +- src/cli/etc/onesecgroup.yaml | 10 +- src/cli/etc/oneshowback.yaml | 2 +- src/cli/etc/onetemplate.yaml | 12 +- src/cli/etc/oneuser.yaml | 14 +- src/cli/etc/onevdc.yaml | 6 +- src/cli/etc/onevm.yaml | 22 +- src/cli/etc/onevnet.yaml | 16 +- src/cli/etc/onezone.yaml | 6 +- src/cli/one_helper/onequota_helper.rb | 6 +- src/cli/one_helper/onezone_helper.rb | 10 +- src/cli/oneacl | 2 +- src/cli/onevcenter | 4 +- src/cloud/common/CloudClient.rb | 2 +- src/cloud/ec2/bin/econe-server | 106 +++--- src/cloud/ec2/lib/EC2QueryServer.rb | 2 +- src/cloud/ec2/lib/keypair.rb | 4 +- src/common/ActionManager.cc | 2 +- src/common/Attribute.cc | 46 +-- src/datastore_mad/remotes/libfs.sh | 116 +++---- src/datastore_mad/remotes/xpath.rb | 2 +- src/im_mad/remotes/kvm-probes.d/cpu.sh | 2 +- src/im_mad/remotes/xen-probes.d/cpu.sh | 2 +- src/lcm/LifeCycleActions.cc | 20 +- src/lcm/LifeCycleStates.cc | 22 +- src/mad/Mad.cc | 38 +-- src/mad/MadManager.cc | 2 +- src/mad/ruby/scripts_common.rb | 6 +- src/mad/ruby/ssh_stream.rb | 6 +- src/mad/ruby/test_mad.rb | 12 +- src/mad/sh/madcommon.sh | 2 +- src/nebula/oned.cc | 10 +- src/oca/java/build.sh | 2 +- src/oca/java/share/examples/SessionInit.java | 6 +- .../client/ClientConfigurationException.java | 6 +- .../org/opennebula/client/OneException.java | 6 +- .../client/acl/RuleParseException.java | 6 +- .../opennebula/client/cluster/Cluster.java | 6 +- .../opennebula/client/template/Template.java | 24 +- src/oca/java/test/HostTest.java | 8 +- src/oca/java/test/SecurityGroupTest.java | 2 +- src/oca/java/test/SessionTest.java | 18 +- src/oca/java/test/TemplateTest.java | 2 +- src/oca/java/test/VirtualNetworkTest.java | 8 +- src/oca/ruby/opennebula/cluster.rb | 8 +- src/oca/ruby/opennebula/group.rb | 2 +- src/oca/ruby/opennebula/host.rb | 2 +- src/oca/ruby/opennebula/host_pool.rb | 2 +- src/oca/ruby/opennebula/vdc.rb | 2 +- src/oca/ruby/opennebula/virtual_machine.rb | 4 +- .../ruby/opennebula/virtual_machine_pool.rb | 8 +- src/oca/ruby/opennebula/zone.rb | 2 +- src/oca/ruby/test/HostPool_spec.rb | 10 +- src/oca/ruby/test/Host_spec.rb | 34 +- src/oca/ruby/test/UserPool_spec.rb | 10 +- src/oca/ruby/test/User_spec.rb | 26 +- src/oca/ruby/test/VirtualMachinePool_spec.rb | 14 +- src/oca/ruby/test/VirtualMachine_spec.rb | 118 +++---- src/oca/ruby/test/VirtualNetworkPool_spec.rb | 12 +- src/oca/ruby/test/VirtualNetwork_spec.rb | 34 +- src/oca/ruby/test/XMLUtils_spec.rb | 10 +- src/onedb/fsck.rb | 6 +- src/onedb/import_slave.rb | 10 +- src/onedb/onedb_backend.rb | 2 +- src/onedb/shared/3.3.0_to_3.3.80.rb | 2 +- src/onedb/shared/3.8.0_to_3.8.1.rb | 2 +- src/onedb/test/oned_mysql.conf | 6 +- src/onedb/test/oned_sqlite.conf | 6 +- src/onegate/onegate-server.rb | 2 +- src/rm/RequestManagerVirtualMachine.cc | 116 +++---- src/scheduler/include/AclXML.h | 6 +- src/scheduler/src/pool/AclXML.cc | 6 +- src/scheduler/src/pool/SConstruct | 10 +- .../OpenNebulaJSON/SecurityGroupJSON.rb | 2 +- .../models/OpenNebulaJSON/TemplateJSON.rb | 4 +- .../models/OpenNebulaJSON/ZoneJSON.rb | 2 +- src/sunstone/models/SunstoneViews.rb | 22 +- src/sunstone/public/Gruntfile.js | 4 +- src/sunstone/public/app/console/spice.js | 2 +- src/sunstone/public/app/login.js | 8 +- src/sunstone/public/app/main.js | 2 +- src/sunstone/public/app/opennebula/vm.js | 2 +- src/sunstone/public/app/sunstone-config.js | 4 +- src/sunstone/public/app/sunstone.js | 16 +- .../app/tabs/acls-tab/form-panels/create.js | 6 +- .../tabs/clusters-tab/form-panels/create.js | 6 +- .../tabs/clusters-tab/panels/datastores.js | 2 +- .../app/tabs/clusters-tab/panels/hosts.js | 2 +- .../app/tabs/clusters-tab/panels/vnets.js | 2 +- .../app/tabs/datastores-tab/datatable.js | 8 +- .../tabs/datastores-tab/form-panels/create.js | 8 +- .../app/tabs/datastores-tab/panels/images.js | 4 +- .../utils/datastore-capacity-bar.js | 2 +- .../public/app/tabs/files-tab/datatable.js | 8 +- .../app/tabs/files-tab/form-panels/create.js | 4 +- .../public/app/tabs/groups-tab/datatable.js | 2 +- .../app/tabs/groups-tab/dialogs/quotas.js | 6 +- .../app/tabs/groups-tab/form-panels/create.js | 6 +- .../public/app/tabs/groups-tab/panels/info.js | 2 +- .../public/app/tabs/hosts-tab/datatable.js | 10 +- .../app/tabs/hosts-tab/form-panels/create.js | 14 +- .../public/app/tabs/hosts-tab/panels/esx.js | 6 +- .../app/tabs/hosts-tab/panels/monitor.js | 8 +- .../public/app/tabs/hosts-tab/panels/vms.js | 4 +- .../public/app/tabs/hosts-tab/panels/wilds.js | 6 +- .../tabs/hosts-tab/utils/can-import-wilds.js | 2 +- .../app/tabs/hosts-tab/utils/cpu-bars.js | 2 +- .../utils/datastores-capacity-table.js | 8 +- .../app/tabs/hosts-tab/utils/memory-bars.js | 2 +- .../public/app/tabs/images-tab/datatable.js | 8 +- .../app/tabs/images-tab/dialogs/clone.js | 6 +- .../app/tabs/images-tab/form-panels/create.js | 4 +- .../app/tabs/images-tab/panels/snapshots.js | 2 +- .../public/app/tabs/images-tab/panels/vms.js | 4 +- .../tabs/marketplace-tab/dialogs/import.js | 8 +- .../tabs/oneflow-services-tab/datatable.js | 8 +- .../oneflow-services-tab/dialogs/scale.js | 4 +- .../tabs/oneflow-services-tab/panels/log.js | 4 +- .../tabs/oneflow-services-tab/panels/roles.js | 6 +- .../tabs/oneflow-templates-tab/datatable.js | 8 +- .../form-panels/create.js | 8 +- .../form-panels/instantiate.js | 8 +- .../oneflow-templates-tab/panels/roles.js | 4 +- src/sunstone/public/app/tabs/provision-tab.js | 2 +- .../app/tabs/provision-tab/flows/list.js | 4 +- .../app/tabs/provision-tab/users/list.js | 4 +- .../tabs/provision-tab/users/quota-widget.js | 4 +- .../public/app/tabs/provision-tab/vms/list.js | 2 +- .../app/tabs/secgroups-tab/dialogs/clone.js | 6 +- .../tabs/secgroups-tab/form-panels/create.js | 8 +- .../tabs/settings-tab/panels/group-quotas.js | 2 +- .../public/app/tabs/templates-tab/actions.js | 2 +- .../app/tabs/templates-tab/datatable.js | 8 +- .../app/tabs/templates-tab/dialogs/clone.js | 6 +- .../tabs/templates-tab/dialogs/instantiate.js | 8 +- .../tabs/templates-tab/form-panels/create.js | 22 +- .../form-panels/create/wizard-tabs/context.js | 10 +- .../form-panels/create/wizard-tabs/general.js | 14 +- .../wizard-tabs/general/capacity-inputs.js | 6 +- .../form-panels/create/wizard-tabs/hybrid.js | 10 +- .../form-panels/create/wizard-tabs/io.js | 10 +- .../form-panels/create/wizard-tabs/network.js | 8 +- .../create/wizard-tabs/network/nic-tab.js | 10 +- .../form-panels/create/wizard-tabs/os.js | 10 +- .../form-panels/create/wizard-tabs/other.js | 8 +- .../create/wizard-tabs/scheduling.js | 8 +- .../form-panels/create/wizard-tabs/storage.js | 8 +- .../create/wizard-tabs/storage/disk-tab.js | 12 +- .../tabs/templates-tab/form-panels/import.js | 8 +- .../app/tabs/templates-tab/panels/template.js | 6 +- .../public/app/tabs/users-tab/actions.js | 2 +- .../app/tabs/users-tab/dialogs/auth-driver.js | 6 +- .../app/tabs/users-tab/dialogs/password.js | 4 +- .../app/tabs/users-tab/dialogs/quotas.js | 6 +- .../app/tabs/users-tab/form-panels/create.js | 6 +- .../app/tabs/users-tab/utils/user-creation.js | 2 +- .../app/tabs/vdcs-tab/form-panels/create.js | 8 +- .../public/app/tabs/vdcs-tab/panels/groups.js | 2 +- .../public/app/tabs/vms-tab/actions.js | 2 +- .../public/app/tabs/vms-tab/datatable.js | 8 +- .../app/tabs/vms-tab/dialogs/attach-disk.js | 10 +- .../app/tabs/vms-tab/dialogs/attach-nic.js | 10 +- .../public/app/tabs/vms-tab/dialogs/deploy.js | 6 +- .../app/tabs/vms-tab/dialogs/disk-saveas.js | 6 +- .../app/tabs/vms-tab/dialogs/disk-snapshot.js | 6 +- .../app/tabs/vms-tab/dialogs/migrate.js | 6 +- .../public/app/tabs/vms-tab/dialogs/resize.js | 8 +- .../app/tabs/vms-tab/dialogs/snapshot.js | 8 +- .../public/app/tabs/vms-tab/dialogs/spice.js | 8 +- .../public/app/tabs/vms-tab/dialogs/vnc.js | 8 +- .../app/tabs/vms-tab/form-panels/create.js | 8 +- .../public/app/tabs/vms-tab/panels/actions.js | 8 +- .../app/tabs/vms-tab/panels/capacity.js | 8 +- .../public/app/tabs/vms-tab/panels/log.js | 14 +- .../public/app/tabs/vms-tab/panels/network.js | 16 +- .../app/tabs/vms-tab/panels/placement.js | 6 +- .../app/tabs/vms-tab/panels/snapshots.js | 6 +- .../public/app/tabs/vms-tab/panels/storage.js | 4 +- .../app/tabs/vms-tab/panels/template.js | 4 +- .../public/app/tabs/vnets-tab/actions.js | 4 +- .../app/tabs/vnets-tab/dialogs/add-ar.js | 2 +- .../app/tabs/vnets-tab/dialogs/reserve.js | 2 +- .../vnets-tab/dialogs/reserve/ar-datatable.js | 4 +- .../app/tabs/vnets-tab/dialogs/update-ar.js | 2 +- .../app/tabs/vnets-tab/form-panels/create.js | 8 +- .../app/tabs/vnets-tab/form-panels/import.js | 8 +- .../app/tabs/vnets-tab/panels/leases.js | 4 +- .../app/tabs/vnets-tab/panels/secgroups.js | 2 +- .../public/app/tabs/zones-tab/datatable.js | 8 +- .../app/tabs/zones-tab/dialogs/create.js | 8 +- .../app/templates/helpers/humanizeSize.js | 2 +- .../app/templates/helpers/isFeatureEnabled.js | 2 +- .../templates/helpers/isTabActionEnabled.js | 2 +- .../templates/helpers/isTabPanelEnabled.js | 2 +- src/sunstone/public/app/utils/accounting.js | 2 +- .../app/utils/dialogs/confirm-with-select.js | 14 +- .../public/app/utils/dialogs/confirm.js | 8 +- .../public/app/utils/dom-datatable.js | 4 +- .../app/utils/form-panels/form-panel.js | 2 +- src/sunstone/public/app/utils/graphs.js | 2 +- src/sunstone/public/app/utils/humanize.js | 4 +- src/sunstone/public/app/utils/locale.js | 2 +- .../public/app/utils/panel/cluster-tr.js | 2 +- .../public/app/utils/panel/rename-tr.js | 2 +- .../public/app/utils/panel/template-table.js | 4 +- src/sunstone/public/app/utils/showback.js | 2 +- .../public/app/utils/template-utils.js | 2 +- .../public/app/utils/vcenter/networks.js | 48 +-- src/sunstone/public/app/utils/vnc.js | 2 +- .../public/app/utils/wizard-fields.js | 4 +- src/sunstone/routes/support.rb | 316 +++++++++--------- src/sunstone/routes/vcenter.rb | 60 ++-- src/sunstone/sunstone-server.rb | 2 +- src/sunstone/test/spec/image_spec.rb | 6 +- src/sunstone/test/spec/vnet_spec.rb | 6 +- src/template/Template.cc | 12 +- src/template/template_parser.c | 86 ++--- src/tm_mad/ceph/clone | 4 +- src/tm_mad/qcow2/cpds | 2 +- src/tm_mad/ssh/mv | 4 +- src/um/UserPool.cc | 2 +- src/vdc/Vdc.cc | 34 +- src/vm/History.cc | 10 +- src/vm/Snapshots.cc | 6 +- src/vm/VirtualMachine.cc | 30 +- src/vm/VirtualMachineHook.cc | 4 +- src/vm/vm_file_var_syntax.y | 2 +- src/vm/vm_var_parser.l | 2 +- src/vm/vm_var_syntax.y | 2 +- src/vmm/LibVirtDriverKVM.cc | 2 +- src/vmm_mad/remotes/az/az_driver.default | 4 +- src/vmm_mad/remotes/kvm/migrate_local | 2 +- src/vmm_mad/remotes/kvm/reboot | 2 +- src/vmm_mad/remotes/kvm/reset | 2 +- src/vmm_mad/remotes/vcenter/deploy | 4 +- src/vmm_mad/remotes/vcenter/snapshot_delete | 2 +- src/vmm_mad/remotes/vcenter/snapshot_revert | 2 +- src/vmm_mad/remotes/vmware/attach_disk | 2 +- src/vmm_mad/remotes/vmware/shutdown | 12 +- src/vmm_mad/remotes/vmware/vmware_driver.rb | 2 +- src/vmm_mad/remotes/xen/cancel | 2 +- src/vmm_mad/remotes/xen/restore | 2 +- src/vmm_mad/remotes/xen/shutdown | 2 +- src/vmm_mad/remotes/xen/xen3/migrate | 2 +- src/vnm/AddressRange.cc | 10 +- src/vnm_mad/remotes/lib/address.rb | 6 +- src/vnm_mad/remotes/lib/command.rb | 8 +- src/vnm_mad/remotes/lib/nic.rb | 6 +- src/vnm_mad/remotes/lib/security_groups.rb | 26 +- .../remotes/lib/security_groups_iptables.rb | 30 +- src/vnm_mad/remotes/lib/vlan.rb | 4 +- src/vnm_mad/remotes/lib/vnm_driver.rb | 8 +- src/xml/expr_arith.y | 6 +- src/xml/expr_bool.y | 4 +- src/xml/expr_parser.l | 6 +- src/zone/ZonePool.cc | 2 +- 290 files changed, 1618 insertions(+), 1618 deletions(-) diff --git a/include/ActionManager.h b/include/ActionManager.h index 9a3a39c236..250dd6d64c 100644 --- a/include/ActionManager.h +++ b/include/ActionManager.h @@ -27,7 +27,7 @@ using namespace std; /** * ActionListener class. Interface to be implemented by any class - * that need to handle actions. There are two predefined actions + * that need to handle actions. There are two predefined actions * (each action is identified with its name, a string): * - ACTION_TIMER, periodic action * - ACTION_FINALIZE, to finalize the action loop @@ -48,7 +48,7 @@ public: static const string ACTION_FINALIZE; ActionListener(){}; - + virtual ~ActionListener(){}; /** @@ -89,7 +89,7 @@ public: void loop( time_t timeout, void * timer_args); - + /** Register the calling object in this action manager. * @param listener a pointer to the action listner */ diff --git a/include/Attribute.h b/include/Attribute.h index 4eddbaa494..4f5be4f5a8 100644 --- a/include/Attribute.h +++ b/include/Attribute.h @@ -161,12 +161,12 @@ public: */ string * to_xml() const { - string * xml = new string; + string * xml = new string; - *xml = "<" + name() + ">"; + *xml = "<" + name() + ">"; - return xml; + return xml; } /** @@ -474,9 +474,9 @@ public: private: - static const char * magic_sep; + static const char * magic_sep; - static const int magic_sep_size; + static const int magic_sep_size; map attribute_value; }; diff --git a/include/DispatchManager.h b/include/DispatchManager.h index 35df649ab4..8707725b27 100644 --- a/include/DispatchManager.h +++ b/include/DispatchManager.h @@ -44,9 +44,9 @@ public: ~DispatchManager(){}; /** - * Initializes internal pointers to other managers. Must be called when - * all the other managers exist in Nebula::instance - */ + * Initializes internal pointers to other managers. Must be called when + * all the other managers exist in Nebula::instance + */ void init_managers(); enum Actions @@ -429,25 +429,25 @@ private: */ VirtualMachinePool * vmpool; - /** + /** * Pointer to TransferManager */ - TransferManager * tm; + TransferManager * tm; - /** - * Pointer to VirtualMachineManager - */ - VirtualMachineManager * vmm; + /** + * Pointer to VirtualMachineManager + */ + VirtualMachineManager * vmm; - /** - * Pointer to LifeCycleManager - */ - LifeCycleManager * lcm; + /** + * Pointer to LifeCycleManager + */ + LifeCycleManager * lcm; - /** - * Pointer to ImageManager - */ - ImageManager * imagem; + /** + * Pointer to ImageManager + */ + ImageManager * imagem; /** * Action engine for the Manager diff --git a/include/HookManagerDriver.h b/include/HookManagerDriver.h index 33cd38d108..3f24eaed24 100644 --- a/include/HookManagerDriver.h +++ b/include/HookManagerDriver.h @@ -56,7 +56,7 @@ public: */ void recover(); - /**