From f9583e415b6f4cac803ab6edef4cafc3c2c95451 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 13 Jun 2011 16:40:46 +0200 Subject: [PATCH] feature #661: Update conf file --- src/cli/one_helper/onehost_helper.rb | 6 ++++-- src/cli/one_helper/oneimage_helper.rb | 6 ++++-- src/cli/one_helper/onetemplate_helper.rb | 6 ++++-- src/cli/one_helper/oneuser_helper.rb | 6 ++++-- src/cli/one_helper/onevm_helper.rb | 6 ++++-- src/cli/one_helper/onevnet_helper.rb | 6 ++++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb index 9ef34283a5..d61bb2f21c 100644 --- a/src/cli/one_helper/onehost_helper.rb +++ b/src/cli/one_helper/onehost_helper.rb @@ -17,12 +17,14 @@ require 'one_helper' class OneHostHelper < OpenNebulaHelper::OneHelper - TABLE_CONF_FILE="#{OpenNebulaHelper::TABLE_CONF_PATH}/onehost.yaml" - def self.rname "HOST" end + def self.conf_file + "onehost.yaml" + end + private def factory(id=nil) diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index a2b7f05dce..4eecb8df0c 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -17,12 +17,14 @@ require 'one_helper' class OneImageHelper < OpenNebulaHelper::OneHelper - TABLE_CONF_FILE="#{OpenNebulaHelper::TABLE_CONF_PATH}/oneimage.yaml" - def self.rname "IMAGE" end + def self.conf_file + "oneimage.yaml" + end + private def factory(id=nil) diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index fdf77a7741..4a8d6564d9 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -17,12 +17,14 @@ require 'one_helper' class OneTemplateHelper < OpenNebulaHelper::OneHelper - TABLE_CONF_FILE="#{OpenNebulaHelper::TABLE_CONF_PATH}/onetemplate.yaml" - def self.rname "TEMPLATE" end + def self.conf_file + "onetemplate.yaml" + end + private def factory(id=nil) diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index 2022cc122a..af3ee481b8 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -17,12 +17,14 @@ require 'one_helper' class OneUserHelper < OpenNebulaHelper::OneHelper - TABLE_CONF_FILE="#{OpenNebulaHelper::TABLE_CONF_PATH}/oneuser.yaml" - def self.rname "USER" end + def self.conf_file + "oneuser.yaml" + end + def self.password_to_str_desc "TBD" end diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index 38dbd9c4d3..88145d5d77 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -17,12 +17,14 @@ require 'one_helper' class OneVMHelper < OpenNebulaHelper::OneHelper - TABLE_CONF_FILE="#{OpenNebulaHelper::TABLE_CONF_PATH}/onevm.yaml" - def self.rname "VM" end + def self.conf_file + "onevm.yaml" + end + private def factory(id=nil) diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index 8def0ae2d4..7f1a26b4a0 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -17,12 +17,14 @@ require 'one_helper' class OneVNetHelper < OpenNebulaHelper::OneHelper - TABLE_CONF_FILE="#{OpenNebulaHelper::TABLE_CONF_PATH}/onevnet.yaml" - def self.rname "VNET" end + def self.conf_file + "onevnet.yaml" + end + private def factory(id=nil)