knife-oneandone 1.0.0 → 1.2.0

data/lib/chef/knife/oneandone_loadbalancer_list.rb

@@ -1,39 +1,39 @@
-require 'chef/knife/oneandone_base'
-
-class Chef
-  class Knife
-    class OneandoneLoadbalancerList < Knife
-      include Knife::OneandoneBase
-
-      banner 'knife oneandone loadbalancer list'
-
-      def run
-        $stdout.sync = true
-
-        init_client
-
-        response = OneAndOne::LoadBalancer.new.list
-        formated_output(response, true)
-
-        load_balancers = [
-          ui.color('ID', :bold),
-          ui.color('Name', :bold),
-          ui.color('IP Address', :bold),
-          ui.color('Method', :bold),
-          ui.color('State', :bold),
-          ui.color('Data Center', :bold)
-        ]
-        response.each do |lb|
-          load_balancers << lb['id']
-          load_balancers << lb['name']
-          load_balancers << lb['ip']
-          load_balancers << lb['method']
-          load_balancers << lb['state']
-          load_balancers << lb['datacenter']['country_code']
-        end
-
-        puts ui.list(load_balancers, :uneven_columns_across, 6)
-      end
-    end
-  end
-end
+require 'chef/knife/oneandone_base'
+
+class Chef
+  class Knife
+    class OneandoneLoadbalancerList < Knife
+      include Knife::OneandoneBase
+
+      banner 'knife oneandone loadbalancer list'
+
+      def run
+        $stdout.sync = true
+
+        init_client
+
+        response = OneAndOne::LoadBalancer.new.list
+        formated_output(response, true)
+
+        load_balancers = [
+          ui.color('ID', :bold),
+          ui.color('Name', :bold),
+          ui.color('IP Address', :bold),
+          ui.color('Method', :bold),
+          ui.color('State', :bold),
+          ui.color('Data Center', :bold)
+        ]
+        response.each do |lb|
+          load_balancers << lb['id']
+          load_balancers << lb['name']
+          load_balancers << lb['ip']
+          load_balancers << lb['method']
+          load_balancers << lb['state']
+          load_balancers << lb['datacenter']['country_code']
+        end
+
+        puts ui.list(load_balancers, :uneven_columns_across, 6)
+      end
+    end
+  end
+end

data/lib/chef/knife/oneandone_mp_list.rb

@@ -1,37 +1,37 @@
-require 'chef/knife/oneandone_base'
-
-class Chef
-  class Knife
-    class OneandoneMpList < Knife
-      include Knife::OneandoneBase
-
-      banner 'knife oneandone mp list'
-
-      def run
-        $stdout.sync = true
-
-        init_client
-
-        response = OneAndOne::MonitoringPolicy.new.list
-        formated_output(response, true)
-
-        mp_list = [
-          ui.color('ID', :bold),
-          ui.color('Name', :bold),
-          ui.color('Email', :bold),
-          ui.color('State', :bold),
-          ui.color('Agent', :bold)
-        ]
-        response.each do |mp|
-          mp_list << mp['id']
-          mp_list << mp['name']
-          mp_list << mp['email']
-          mp_list << mp['state']
-          mp_list << mp['agent'].to_s
-        end
-
-        puts ui.list(mp_list, :uneven_columns_across, 5)
-      end
-    end
-  end
-end
+require 'chef/knife/oneandone_base'
+
+class Chef
+  class Knife
+    class OneandoneMpList < Knife
+      include Knife::OneandoneBase
+
+      banner 'knife oneandone mp list'
+
+      def run
+        $stdout.sync = true
+
+        init_client
+
+        response = OneAndOne::MonitoringPolicy.new.list
+        formated_output(response, true)
+
+        mp_list = [
+          ui.color('ID', :bold),
+          ui.color('Name', :bold),
+          ui.color('Email', :bold),
+          ui.color('State', :bold),
+          ui.color('Agent', :bold)
+        ]
+        response.each do |mp|
+          mp_list << mp['id']
+          mp_list << mp['name']
+          mp_list << mp['email']
+          mp_list << mp['state']
+          mp_list << mp['agent'].to_s
+        end
+
+        puts ui.list(mp_list, :uneven_columns_across, 5)
+      end
+    end
+  end
+end

data/lib/chef/knife/oneandone_server_baremetal_model_list.rb

@@ -0,0 +1,31 @@
+require 'chef/knife/oneandone_base'
+
+class Chef
+  class Knife
+    class OneandoneBaremetalModelList < Knife
+      include Knife::OneandoneBase
+
+      banner 'knife oneandone baremetal model list'
+
+      def run
+        $stdout.sync = true
+
+        init_client
+
+        response = OneAndOne::Server.new.list_baremetal_models
+        formated_output(response, true)
+
+        baremetal_model_list = [
+          ui.color('ID', :bold),
+          ui.color('Name', :bold)
+        ]
+        response.each do |baremetal_model|
+          baremetal_model_list << baremetal_model['id']
+          baremetal_model_list << baremetal_model['name']
+        end
+
+        puts ui.list(baremetal_model_list, :uneven_columns_across, 2)
+      end
+    end
+  end
+end

data/lib/chef/knife/oneandone_server_create.rb

@@ -1,163 +1,193 @@
-require 'chef/knife/oneandone_base'
-require '1and1/helpers'
-
-class Chef
-  class Knife
-    class OneandoneServerCreate < Knife
-      include Knife::OneandoneBase
-      include Oneandone::Helpers
-
-      banner 'knife oneandone server create (options)'
-
-      option :datacenter_id,
-             short: '-D DATACENTER_ID',
-             long: '--datacenter-id DATACENTER_ID',
-             description: 'ID of the virtual data center',
-             proc: proc { |datacenter_id| Chef::Config[:knife][:datacenter_id] = datacenter_id }
-
-      option :name,
-             short: '-n NAME',
-             long: '--name NAME',
-             description: 'Name of the server (required)'
-
-      option :description,
-             long: '--description DESCRIPTION',
-             description: 'Description of the server'
-
-      option :appliance_id,
-             short: '-I APPLIANCE_ID',
-             long: '--appliance-id APPLIANCE_ID',
-             description: 'ID of the server appliance (required)',
-             proc: proc { |appliance_id| Chef::Config[:knife][:appliance_id] = appliance_id }
-
-      option :fixed_size_id,
-             short: '-S FIXED_SIZE_ID',
-             long: '--fixed-size-id FIXED_SIZE_ID',
-             description: 'ID of the fixed instance size',
-             proc: proc { |fixed_size_id| Chef::Config[:knife][:fixed_size_id] = fixed_size_id }
-
-      option :cpu,
-             short: '-P PROCESSORS',
-             long: '--cpu PROCESSORS',
-             description: "The number of processors. Required, if '--fixed-size-id' is not specified."
-
-      option :cores,
-             short: '-C CORES',
-             long: '--cores CORES',
-             description: "The number of cores per processor. Required, if '--fixed-size-id' is not specified."
-
-      option :ram,
-             short: '-r RAM',
-             long: '--ram RAM',
-             description: "The amount of RAM in GB. Required, if '--fixed-size-id' is not specified."
-
-      option :hdd_size,
-             short: '-H HDD_SIZE',
-             long: '--hdd-size HDD_SIZE',
-             description: "The HDD size in GB. Required, if '--fixed-size-id' is not specified."
-
-      option :password,
-             short: '-p PASSWORD',
-             long: '--password PASSWORD',
-             description: "The password of the server's root/administrator user"
-
-      option :rsa_key,
-             long: '--rsa-key RSA_KEY',
-             description: 'Specify a valid public SSH Key to be copied into your 1&1 server during creation.',
-             proc: proc { |rsa_key| Chef::Config[:knife][:rsa_key] = rsa_key }
-
-      option :firewall_id,
-             long: '--firewall-id FIREWALL_ID',
-             description: 'ID of a firewall policy to be used for the server',
-             proc: proc { |firewall_id| Chef::Config[:knife][:firewall_id] = firewall_id }
-
-      option :power_on,
-             long: '--power-on BOOLEAN_VALUE',
-             description: 'Power on the server after creating (true by default).',
-             default: true
-
-      option :ip_id,
-             long: '--ip-id IP_ID',
-             description: 'ID of an IP address to be used for the server'
-
-      option :load_balancer_id,
-             long: '--load-balancer-id LOAD_BALANCER_ID',
-             description: 'ID of a load balancer to be used for the server',
-             proc: proc { |load_balancer_id| Chef::Config[:knife][:load_balancer_id] = load_balancer_id }
-
-      option :monitoring_policy_id,
-             long: '--monitoring-policy-id MONITORING_POLICY_ID',
-             description: 'ID of a monitoring policy to be used for the server',
-             proc: proc { |monitoring_policy_id| Chef::Config[:knife][:monitoring_policy_id] = monitoring_policy_id }
-
-      option :wait,
-             long: '--[no-]wait',
-             description: 'Wait for the server deployment to complete (true by default).',
-             boolean: true,
-             default: true
-
-      def run
-        $stdout.sync = true
-
-        validate(config[:name], '-n NAME')
-        validate(config[:appliance_id], '-I APPLIANCE_ID')
-
-        init_client
-
-        size_id = config[:fixed_size_id]
-        hdds = nil
-
-        if size_id.nil? || size_id.empty?
-          hdds = [
-            {
-              'size' => config[:hdd_size],
-              'is_main' => true
-            }
-          ]
-        end
-
-        server = OneAndOne::Server.new
-        response = server.create(
-          name: config[:name],
-          description: config[:description],
-          datacenter_id: config[:datacenter_id],
-          fixed_instance_id: size_id,
-          appliance_id: config[:appliance_id],
-          vcore: config[:cpu],
-          cores_per_processor: config[:cores],
-          ram: config[:ram],
-          hdds: hdds,
-          power_on: config[:power_on],
-          password: config[:password],
-          rsa_key: config[:rsa_key],
-          firewall_id: config[:firewall_id],
-          ip_id: config[:ip_id],
-          load_balancer_id: config[:load_balancer_id],
-          monitoring_policy_id: config[:monitoring_policy_id]
-        )
-
-        if config[:wait]
-          puts ui.color('Deploying, wait for the operation to complete...', :cyan).to_s
-
-          # wait for provisioning 30m max
-          server.wait_for(timeout: 30, interval: 15)
-
-          formated_output(server.get, true)
-
-          first_password = server.first_password.nil? ? config[:password] : server.first_password
-          first_ip = !server.specs['ips'].empty? ? server.specs['ips'][0]['ip'] : ''
-
-          puts "\t#{ui.color('ID', :cyan)}: #{server.id}"
-          puts "\t#{ui.color('Name', :cyan)}: #{server.specs['name']}"
-          puts "\t#{ui.color('First IP', :cyan)}: #{first_ip}"
-          puts "\t#{ui.color('First Password', :cyan)}: #{first_password}\n"
-
-          puts ui.color('done', :bold).to_s
-        else
-          formated_output(response, true)
-          puts "Server #{response['id']} is #{ui.color('being deployed', :bold)}"
-        end
-      end
-    end
-  end
-end
+require 'chef/knife/oneandone_base'
+require '1and1/helpers'
+
+class Chef
+  class Knife
+    class OneandoneServerCreate < Knife
+      include Knife::OneandoneBase
+      include Oneandone::Helpers
+
+      banner 'knife oneandone server create (options)'
+
+      option :datacenter_id,
+             short: '-D DATACENTER_ID',
+             long: '--datacenter-id DATACENTER_ID',
+             description: 'ID of the virtual data center',
+             proc: proc { |datacenter_id| Chef::Config[:knife][:datacenter_id] = datacenter_id }
+
+      option :name,
+             short: '-n NAME',
+             long: '--name NAME',
+             description: 'Name of the server (required)'
+
+      option :description,
+             long: '--description DESCRIPTION',
+             description: 'Description of the server'
+
+      option :appliance_id,
+             short: '-I APPLIANCE_ID',
+             long: '--appliance-id APPLIANCE_ID',
+             description: 'ID of the server appliance (required)',
+             proc: proc { |appliance_id| Chef::Config[:knife][:appliance_id] = appliance_id }
+
+      option :fixed_size_id,
+             short: '-S FIXED_SIZE_ID',
+             long: '--fixed-size-id FIXED_SIZE_ID',
+             description: 'ID of the fixed instance size',
+             proc: proc { |fixed_size_id| Chef::Config[:knife][:fixed_size_id] = fixed_size_id }
+
+      option :baremetal_model_id,
+             short: '-BM BAREMETAL_MODEL_ID',
+             long: '--baremetal-model-id BAREMETAL_MODEL_ID',
+             description: "ID of the baremetal model. Required, if 'server_type' is 'baremetal'",
+             proc: proc { |baremetal_model_id| Chef::Config[:knife][:baremetal_model_id] = baremetal_model_id }
+
+      option :cpu,
+             short: '-P PROCESSORS',
+             long: '--cpu PROCESSORS',
+             description: "The number of processors. Required, if neither '--fixed-size-id' nor '--baremetal-model-id' are specified."
+
+      option :cores,
+             short: '-C CORES',
+             long: '--cores CORES',
+             description: "The number of cores per processor. Required, if neither '--fixed-size-id' nor '--baremetal-model-id' are specified."
+
+      option :ram,
+             short: '-r RAM',
+             long: '--ram RAM',
+             description: "The amount of RAM in GB. Required, if neither '--fixed-size-id' nor '--baremetal-model-id' are specified."
+
+      option :hdd_size,
+             short: '-H HDD_SIZE',
+             long: '--hdd-size HDD_SIZE',
+             description: "The HDD size in GB. Required, if neither '--fixed-size-id' nor '--baremetal-model-id' are specified."
+
+      option :password,
+             short: '-p PASSWORD',
+             long: '--password PASSWORD',
+             description: "The password of the server's root/administrator user"
+
+      option :rsa_key,
+             long: '--rsa-key RSA_KEY',
+             description: 'Specify a valid public SSH Key to be copied into your 1&1 server during creation.',
+             proc: proc { |rsa_key| Chef::Config[:knife][:rsa_key] = rsa_key }
+
+      option :firewall_id,
+             long: '--firewall-id FIREWALL_ID',
+             description: 'ID of a firewall policy to be used for the server',
+             proc: proc { |firewall_id| Chef::Config[:knife][:firewall_id] = firewall_id }
+
+      option :power_on,
+             long: '--power-on BOOLEAN_VALUE',
+             description: 'Power on the server after creating (true by default).',
+             default: true
+
+      option :ip_id,
+             long: '--ip-id IP_ID',
+             description: 'ID of an IP address to be used for the server'
+
+      option :load_balancer_id,
+             long: '--load-balancer-id LOAD_BALANCER_ID',
+             description: 'ID of a load balancer to be used for the server',
+             proc: proc { |load_balancer_id| Chef::Config[:knife][:load_balancer_id] = load_balancer_id }
+
+      option :monitoring_policy_id,
+             long: '--monitoring-policy-id MONITORING_POLICY_ID',
+             description: 'ID of a monitoring policy to be used for the server',
+             proc: proc { |monitoring_policy_id| Chef::Config[:knife][:monitoring_policy_id] = monitoring_policy_id }
+
+      option :public_key,
+             short: '-pk PUBLIC_KEY',
+             long: '--public-key PUBLIC_KEY',
+             description: 'A comma separated list of SSH Key IDs to be copied to the server'
+
+      option :server_type,
+             short: '-st SERVER_TYPE',
+             long: '--server-type SERVER_TYPE',
+             description: "Server type 'cloud' or 'baremetal'."
+
+      option :wait,
+             long: '--[no-]wait',
+             description: 'Wait for the server deployment to complete (true by default).',
+             boolean: true,
+             default: true
+
+      def run
+        $stdout.sync = true
+
+        validate(config[:name], '-n NAME')
+        validate(config[:appliance_id], '-I APPLIANCE_ID')
+
+        init_client
+
+        size_id = config[:fixed_size_id]
+        hdds = nil
+
+        if size_id.nil? || size_id.empty?
+          hdds = [
+            {
+              'size' => config[:hdd_size],
+              'is_main' => true
+            }
+          ]
+        end
+
+        pkeys_config = config[:public_key]
+        pkeys = nil
+
+        if !pkeys_config.nil? && !pkeys_config.empty?
+          pkeys_config = pkeys_config.split(',')
+          pkeys = []
+          pkeys_config.each do |key|
+            pkeys << key.strip
+          end
+        end
+
+        server = OneAndOne::Server.new
+        response = server.create(
+          name: config[:name],
+          description: config[:description],
+          datacenter_id: config[:datacenter_id],
+          fixed_instance_id: size_id,
+          appliance_id: config[:appliance_id],
+          vcore: config[:cpu],
+          cores_per_processor: config[:cores],
+          ram: config[:ram],
+          hdds: hdds,
+          power_on: config[:power_on],
+          password: config[:password],
+          rsa_key: config[:rsa_key],
+          firewall_id: config[:firewall_id],
+          ip_id: config[:ip_id],
+          load_balancer_id: config[:load_balancer_id],
+          monitoring_policy_id: config[:monitoring_policy_id],
+          public_key: pkeys,
+          server_type: config[:server_type],
+          baremetal_model_id: config[:baremetal_model_id]
+        )
+
+        if config[:wait]
+          puts ui.color('Deploying, wait for the operation to complete...', :cyan).to_s
+
+          # wait for provisioning 30m max
+          server.wait_for(timeout: 30, interval: 15)
+
+          formated_output(server.get, true)
+
+          first_password = server.first_password.nil? ? config[:password] : server.first_password
+          first_ip = !server.specs['ips'].empty? ? server.specs['ips'][0]['ip'] : ''
+
+          puts "\t#{ui.color('ID', :cyan)}: #{server.id}"
+          puts "\t#{ui.color('Name', :cyan)}: #{server.specs['name']}"
+          puts "\t#{ui.color('First IP', :cyan)}: #{first_ip}"
+          puts "\t#{ui.color('First Password', :cyan)}: #{first_password}\n"
+
+          puts ui.color('done', :bold).to_s
+        else
+          formated_output(response, true)
+          puts "Server #{response['id']} is #{ui.color('being deployed', :bold)}"
+        end
+      end
+    end
+  end
+end