From 64d0b918996f61c164eeae504b30e0e0db5d0b62 Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Thu, 20 Feb 2020 15:23:30 +0100 Subject: [PATCH] B #4226: Broken imports in econe tools (#4227) --- src/cloud/ec2/bin/econe-allocate-address | 2 ++ src/cloud/ec2/bin/econe-associate-address | 3 +++ src/cloud/ec2/bin/econe-attach-volume | 2 ++ src/cloud/ec2/bin/econe-create-keypair | 2 ++ src/cloud/ec2/bin/econe-create-volume | 2 ++ src/cloud/ec2/bin/econe-delete-keypair | 2 ++ src/cloud/ec2/bin/econe-delete-volume | 2 ++ src/cloud/ec2/bin/econe-describe-addresses | 2 ++ src/cloud/ec2/bin/econe-describe-images | 2 ++ src/cloud/ec2/bin/econe-describe-instances | 2 ++ src/cloud/ec2/bin/econe-describe-keypairs | 2 ++ src/cloud/ec2/bin/econe-describe-volumes | 2 ++ src/cloud/ec2/bin/econe-detach-volume | 2 ++ src/cloud/ec2/bin/econe-disassociate-address | 2 ++ src/cloud/ec2/bin/econe-reboot-instances | 2 ++ src/cloud/ec2/bin/econe-register | 2 ++ src/cloud/ec2/bin/econe-release-address | 2 ++ src/cloud/ec2/bin/econe-run-instances | 2 ++ src/cloud/ec2/bin/econe-start-instances | 2 ++ src/cloud/ec2/bin/econe-stop-instances | 2 ++ src/cloud/ec2/bin/econe-terminate-instances | 2 ++ src/cloud/ec2/bin/econe-upload | 2 ++ 22 files changed, 45 insertions(+) diff --git a/src/cloud/ec2/bin/econe-allocate-address b/src/cloud/ec2/bin/econe-allocate-address index f264ac100d..71110b1714 100755 --- a/src/cloud/ec2/bin/econe-allocate-address +++ b/src/cloud/ec2/bin/econe-allocate-address @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-associate-address b/src/cloud/ec2/bin/econe-associate-address index 9bcafddf94..eaf896c410 100755 --- a/src/cloud/ec2/bin/econe-associate-address +++ b/src/cloud/ec2/bin/econe-associate-address @@ -30,10 +30,13 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' + require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-attach-volume b/src/cloud/ec2/bin/econe-attach-volume index 99de0f8f7b..cb225c19f5 100755 --- a/src/cloud/ec2/bin/econe-attach-volume +++ b/src/cloud/ec2/bin/econe-attach-volume @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-create-keypair b/src/cloud/ec2/bin/econe-create-keypair index 3ae124183b..9e50498686 100755 --- a/src/cloud/ec2/bin/econe-create-keypair +++ b/src/cloud/ec2/bin/econe-create-keypair @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-create-volume b/src/cloud/ec2/bin/econe-create-volume index a8d2cb2446..0c44f65160 100755 --- a/src/cloud/ec2/bin/econe-create-volume +++ b/src/cloud/ec2/bin/econe-create-volume @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-delete-keypair b/src/cloud/ec2/bin/econe-delete-keypair index f858d79745..323f7c8fe8 100755 --- a/src/cloud/ec2/bin/econe-delete-keypair +++ b/src/cloud/ec2/bin/econe-delete-keypair @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-delete-volume b/src/cloud/ec2/bin/econe-delete-volume index d912ff5e65..753c3f5955 100755 --- a/src/cloud/ec2/bin/econe-delete-volume +++ b/src/cloud/ec2/bin/econe-delete-volume @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-describe-addresses b/src/cloud/ec2/bin/econe-describe-addresses index d149875e3b..8a1ff5bb67 100755 --- a/src/cloud/ec2/bin/econe-describe-addresses +++ b/src/cloud/ec2/bin/econe-describe-addresses @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-describe-images b/src/cloud/ec2/bin/econe-describe-images index 4dac00ae79..ca864ca2ba 100755 --- a/src/cloud/ec2/bin/econe-describe-images +++ b/src/cloud/ec2/bin/econe-describe-images @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-describe-instances b/src/cloud/ec2/bin/econe-describe-instances index 8804325c61..b59d6336a8 100755 --- a/src/cloud/ec2/bin/econe-describe-instances +++ b/src/cloud/ec2/bin/econe-describe-instances @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-describe-keypairs b/src/cloud/ec2/bin/econe-describe-keypairs index 53798190b3..2942498059 100755 --- a/src/cloud/ec2/bin/econe-describe-keypairs +++ b/src/cloud/ec2/bin/econe-describe-keypairs @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-describe-volumes b/src/cloud/ec2/bin/econe-describe-volumes index c491672073..9e0464934e 100755 --- a/src/cloud/ec2/bin/econe-describe-volumes +++ b/src/cloud/ec2/bin/econe-describe-volumes @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-detach-volume b/src/cloud/ec2/bin/econe-detach-volume index e47da8d7a9..cfbd9ffdf9 100755 --- a/src/cloud/ec2/bin/econe-detach-volume +++ b/src/cloud/ec2/bin/econe-detach-volume @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-disassociate-address b/src/cloud/ec2/bin/econe-disassociate-address index 42ceb8281c..b70271ee2b 100755 --- a/src/cloud/ec2/bin/econe-disassociate-address +++ b/src/cloud/ec2/bin/econe-disassociate-address @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-reboot-instances b/src/cloud/ec2/bin/econe-reboot-instances index 3a8a40991c..4be297f69b 100755 --- a/src/cloud/ec2/bin/econe-reboot-instances +++ b/src/cloud/ec2/bin/econe-reboot-instances @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-register b/src/cloud/ec2/bin/econe-register index abec82d181..3b04947b92 100755 --- a/src/cloud/ec2/bin/econe-register +++ b/src/cloud/ec2/bin/econe-register @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-release-address b/src/cloud/ec2/bin/econe-release-address index da308217e2..597f05c789 100755 --- a/src/cloud/ec2/bin/econe-release-address +++ b/src/cloud/ec2/bin/econe-release-address @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-run-instances b/src/cloud/ec2/bin/econe-run-instances index 6c9b3fb27b..9f5a65f4f8 100755 --- a/src/cloud/ec2/bin/econe-run-instances +++ b/src/cloud/ec2/bin/econe-run-instances @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-start-instances b/src/cloud/ec2/bin/econe-start-instances index afaa089709..f4d303c6f7 100755 --- a/src/cloud/ec2/bin/econe-start-instances +++ b/src/cloud/ec2/bin/econe-start-instances @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-stop-instances b/src/cloud/ec2/bin/econe-stop-instances index 2f164e4943..a7e55f6573 100755 --- a/src/cloud/ec2/bin/econe-stop-instances +++ b/src/cloud/ec2/bin/econe-stop-instances @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-terminate-instances b/src/cloud/ec2/bin/econe-terminate-instances index 62205ed695..e9167bb429 100755 --- a/src/cloud/ec2/bin/econe-terminate-instances +++ b/src/cloud/ec2/bin/econe-terminate-instances @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI diff --git a/src/cloud/ec2/bin/econe-upload b/src/cloud/ec2/bin/econe-upload index f6cd3eac6d..850490d9f4 100755 --- a/src/cloud/ec2/bin/econe-upload +++ b/src/cloud/ec2/bin/econe-upload @@ -30,10 +30,12 @@ if File.directory?(GEMS_LOCATION) end $LOAD_PATH << RUBY_LIB_LOCATION +$LOAD_PATH << RUBY_LIB_LOCATION + '/cli' $LOAD_PATH << RUBY_LIB_LOCATION + '/cloud' require 'cli/command_parser' require 'cli/cli_helper' +require 'cli/one_helper' require 'econe/EC2QueryClient' include CloudCLI