fog-oneandone 1.0 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 56d7c39794b25233e7aaa863d457f412a671af87
-  data.tar.gz: b2c478a22092ab58ad2ba8981cd28b317d83a611
+SHA256:
+  metadata.gz: f373bf00aa4accd5cfc0f5cb70ba5c64e7a4d7b21a2ba1ec69abafcf74fe4d81
+  data.tar.gz: b5d9f9dd6516e9a97ded3f3d57d000c0de120c8ee73e28df15500851d45f6d8e
 SHA512:
-  metadata.gz: a067ef076c2893ded4479444789baf5fd6cf9cd768d9d772a2f30e91c392c4d1e6c90a84c5544d62288e5b15d5e58db0638dbebd37c05eb1d3bb3482c2535dd1
-  data.tar.gz: 959e2eda82a1a0e56550fff4ad9020eb016c002c3e80af37cfef55db86e085e1b1bc870f27f6080bb52ddecfe280e7c4c28ddc05f1697a000f123d1b611ca344
+  metadata.gz: ff99d22c4ec2285d479c73027f18d443200b3675c3033e9c18e5d0901f87dc4fbe5f03124303aa8cd56fbdfc4a37c2df1520e495c17764d2c6aa8d863c9b7317
+  data.tar.gz: 36bef36cf89ddf299c767dd1d2c93ecbd225fb7fde5fbd5448f9821aa6f2c2486d89291006362f987f008590cc862988a18c405ec7aa07954b0ec074200541b3

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/tjb1019/fog.svg?branch=master)](https://travis-ci.org/tjb1019/fog)
 
-Fog is an open-source, community Ruby library used for interacting with popular cloud infrastructure providers through a single, unified API.
+Fog is an open-source, community Ruby library used for interacting with popular cloud infrastructure providers through a single, unified API. For more information on the Fog plug-in see the [1&1 Community Portal](https://www.1and1.com/cloud-community/).
 
 This guide will show you how to programmatically use the 1&1 provider in Fog to perform common management tasks available in the 1&1 Cloud Panel.
 
@@ -187,6 +187,8 @@ public_ips
 private_networks
 monitoring_policies
 vpns
+block_storages
+ssh_keys
 ```
 
 Each collection comes equipped with the `create`, `all`, and `get` methods.  You've seen how the `create` method works in our server example above.  `all` will fetch every object of that type from the provider, and generate a model for each of those objects.  Here's an example:

data/Rakefile

@@ -0,0 +1,24 @@
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+task :default => :travis
+task :travis => ["test", "test:travis"]
+task :console do
+  exec "pry -r fog/oneandone -I ./lib"
+end
+
+Rake::TestTask.new do |t|
+  t.libs.push %w(spec)
+  t.test_files = FileList["tests/**/**.rb"]
+  t.verbose = true
+end
+
+namespace :test do
+  mock = ENV["FOG_MOCK"] || "true"
+  task :travis do
+    sh("export FOG_MOCK=#{mock} && bundle exec shindont")
+  end
+end
+
+desc "Default Task"
+task :default => [:test]

data/examples/example_app.rb

@@ -4,11 +4,18 @@ compute = Fog::Compute::OneAndOne.new({
   :oneandone_api_key => '<API-TOKEN>'
 })
 
+# Create SSH Key
+my_ssh_key = compute.ssh_keys.create(name: 'Fog Example App Ssh Key',
+                                     description: 'My Fog SSH Key Description',
+                                     public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCezYMOgAan+JmatgFJ+Q1FUNjrqNVgAvcTkjYJwHVcQaolq9f9qB7tEeUPDNj2oNN49joAmTcllDcPIxryT5PnQUaaUhu4ZJ9+bRtXCyhnf2LJQdVfzBFEBJX9fW4RiV1XtSAtLRBrbrCb4JjHmhIYpvhBHC29Ve+g64nhdvBhqyLZ3SLI2U/opEmt5u2xftWGl0TBSQYveqc4ntz3fe+f9XlBHvK3Nw12bCLmLle7jQuZ4lXyAYqNAfdOMTs2zMTk422Dl/h4+zRh1h4rM9zaCk4+g3kdugJm7Vul03wm43cHmHsJv51R3XKSHzgb7q/eNj+YdMi5Ndt0Bm+bLjw4")
+puts 'Creating ssh key...'
+
 # Create Server
-my_server = compute.servers.create(name: 'Example App Server',
-  fixed_instance_id: '65929629F35BBFBA63022008F773F3EB',
-  appliance_id: '6C902E5899CC6F7ED18595EBEB542EE1',
-  datacenter_id: '5091F6D8CBFEF9C26ACE957C652D5D49')
+my_server = compute.servers.create(name: 'Fog Example App Server',
+  fixed_instance_id: 'CCC1C54896223068E05EFC17614EE690',
+  appliance_id: 'C572494C271ED64142E5FD93E084BBFC',
+  datacenter_id: '4EFAD5836CE43ACA502FD5B99BEE44EF',
+  public_key: [my_ssh_key.id])
 
 puts 'Creating server...'
 puts my_server.wait_for { ready? }
@@ -17,15 +24,21 @@ puts my_server.wait_for { ready? }
 # Create Firewall
 puts "----------"
 rule1 = {
-  'protocol' => 'TCP',
-  'port_from' => 80,
-  'port_to' => 80,
-  'source' => '0.0.0.0'
+    'description' => 'Testing firewall improvements fog',
+    'protocol' => 'TCP',
+    'port' => '90',
+    'source' => '0.0.0.0'
+}
+rule2 = {
+    'protocol' => 'TCP',
+    'port_from' => 80,
+    'port_to' => 80,
+    'source' => '0.0.0.0'
 }
 
-rules = [rule1]
+rules = [rule1, rule2]
 
-my_firewall = compute.firewalls.create(name: 'Example App Firewall',
+my_firewall = compute.firewalls.create(name: 'Fog Example App Firewall',
   rules: rules)
 puts 'Creating Firewall...'
 puts my_firewall.wait_for { ready? }
@@ -42,10 +55,10 @@ rule1 = {
 
 rules = [rule1]
 
-my_load_balancer = compute.load_balancers.create(name: 'Example App LB',
+my_load_balancer = compute.load_balancers.create(name: 'Fog Example App LB',
   rules: rules, health_check_test: 'TCP', health_check_interval: 40,
   persistence: true, persistence_time: 1200, method: 'ROUND_ROBIN',
-  datacenter_id: '5091F6D8CBFEF9C26ACE957C652D5D49')
+  datacenter_id: '4EFAD5836CE43ACA502FD5B99BEE44EF')
 puts 'Creating Load Balancer...'
 puts my_load_balancer.wait_for { ready? }
 
@@ -65,6 +78,15 @@ my_server.add_load_balancer(ip_id: my_server.ips[0]['id'],
   load_balancer_id: my_load_balancer.id)
 puts my_server.wait_for { ready? }
 
+# Create Block Storage
+my_block_storage = compute.block_storages.create(
+  name: 'My Fog Block Storage', size: 20,
+  description: 'Testing fog block storage',
+  datacenter_id: '4EFAD5836CE43ACA502FD5B99BEE44EF',
+  server_id: my_server.id
+)
+puts 'Creating Block Storage...'
+puts my_block_storage.wait_for { ready? }
 
 # Cleanup
 puts "----------"
@@ -76,5 +98,10 @@ puts 'Destroying load balancer...'
 puts my_load_balancer.destroy
 
 puts "----------"
+puts my_firewall.wait_for { ready? }
 puts 'Destroying firewall...'
 puts my_firewall.destroy
+
+puts "----------"
+puts 'Destroying SSH key...'
+puts my_ssh_key.destroy

data/fog-oneandone.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fog-oneandone"
-  spec.version       = "1.0"
+  spec.version       = "1.2"
   spec.authors       = ["Tyler Burkhardt (stackpointcloud.com)"]
   spec.email         = "tyler@stackpointcloud.com"
   spec.summary       = "Module for the 'fog' gem to support 1and1."
@@ -19,4 +19,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "fog-core"
   spec.add_runtime_dependency "fog-json"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "pry", "~> 0.10"
 end

data/lib/oneandone/compute.rb

@@ -38,6 +38,21 @@ module Fog
       model :vpn
       collection :vpns
 
+      model :block_storage
+      collection :block_storages
+
+      model :ssh_key
+      collection :ssh_keys
+
+      model :baremetal_model
+      collection :baremetal_models
+
+      model :server_appliance
+      collection :server_appliances
+
+      model :recovery_appliance
+      collection :recovery_appliances
+
       # Requests
       request_path 'oneandone/requests/compute'
 
@@ -94,14 +109,12 @@ module Fog
 
       request :clone_server
 
-
       request :list_images
       request :create_image
       request :get_image
       request :update_image
       request :delete_image
 
-
       request :list_shared_storages
       request :create_shared_storage
       request :get_shared_storage
@@ -116,7 +129,6 @@ module Fog
       request :access
       request :change_password
 
-
       request :list_firewalls
       request :get_firewall
       request :create_firewall
@@ -125,7 +137,6 @@ module Fog
 
       request :list_firewall_ips
       request :get_firewall_ip
-      request :remove_firewall_ip
       request :add_firewall_ips
 
       request :list_firewall_rules
@@ -133,7 +144,6 @@ module Fog
       request :add_firewall_rules
       request :delete_firewall_rule
 
-
       request :list_load_balancers
       request :create_load_balancer
       request :get_load_balancer
@@ -150,14 +160,12 @@ module Fog
       request :get_load_balancer_rule
       request :delete_load_balancer_rule
 
-
       request :list_public_ips
       request :create_public_ip
       request :get_public_ip
       request :update_public_ip
       request :delete_public_ip
 
-
       request :list_private_networks
       request :create_private_network
       request :get_private_network
@@ -169,11 +177,9 @@ module Fog
       request :remove_private_network_server
       request :add_private_network_servers
 
-
       request :list_monitored_servers
       request :get_monitored_server
 
-
       request :list_monitoring_policies
       request :get_monitoring_policy
       request :create_monitoring_policy
@@ -197,36 +203,51 @@ module Fog
       request :remove_mp_server
       request :add_mp_servers
 
-
       request :list_logs
       request :get_log
 
-
       request :list_usages
 
-
       request :list_server_appliances
       request :get_server_appliance
 
-
       request :list_dvds
       request :get_dvd_iso
 
-
       request :list_vpns
       request :create_vpn
       request :get_vpn
       request :update_vpn
       request :delete_vpn
 
-
       request :ping
       request :ping_auth
 
-
       request :list_datacenters
       request :get_datacenter
 
+      request :list_block_storages
+      request :create_block_storage
+      request :get_block_storage
+      request :update_block_storage
+      request :delete_block_storage
+
+      request :get_block_storage_server
+      request :add_block_storage_server
+      request :remove_block_storage_server
+
+      request :list_ssh_keys
+      request :create_ssh_key
+      request :get_ssh_key
+      request :update_ssh_key
+      request :delete_ssh_key
+
+      request :list_baremetal_models
+      request :get_baremetal_model
+
+      request :list_recovery_appliances
+      request :get_recovery_appliance
+
       class Real
         
         def initialize(options = {})
@@ -296,6 +317,44 @@ module Fog
               :private_networks  => [],
               :monitoring_policies  => [],
               :vpns => [],
+              :ssh_keys => [],
+              :block_storages => [],
+              :baremetal_models  => [
+                {
+                  "name" => "baremetal_1_name",
+                  "id" => "8C626C1A7005D0D1F527143C413D461E",
+                  "hardware" => {
+                    "cores" => 1,
+                    "cores_per_processor" => 4,
+                    "ram" => 16,
+                    "unit" => "GB",
+                    "hdds" => [
+                      {
+                        "size" => 480,
+                        "unit" => "GB",
+                        "is_main" => true
+                      }
+                    ]
+                  }
+                },
+                {
+                  "name" => "baremetal_2_name",
+                  "id" => "8C626C1A7005D0D1F5271434563D461A",
+                  "hardware" => {
+                    "cores" => 1,
+                    "cores_per_processor" => 4,
+                    "ram" => 64,
+                    "unit" => "GB",
+                    "hdds" => [
+                      {
+                        "size" => 800,
+                        "unit" => "GB",
+                        "is_main" => true
+                      }
+                    ]
+                  }
+                }
+              ],
               :datacenters => [
                 {
                   "id" => "81DEF28500FBC2A973FC0C620DF5B721",
@@ -679,6 +738,34 @@ module Fog
                   "os_architecture" => 64,
                   "type" => "OS"
                 }
+              ],
+              :recovery_appliances => [
+                {
+                  "id" => "81504C620D98BCEBAA5202D145203B4B",
+                  "name" => "Recovery image name",
+                  "available_datacenters" => [
+                    "DA41201B4A006EDE6DA62A5A62A658E7",
+                    "47FA5A2D251AE57935E30F9D5AB4F817",
+                    "7C5FA1D21B98DE39D7516333AAB7DA54"
+                  ],
+                  "os_family" => "Linux",
+                  "os" => "CentOS",
+                  "os_version" => "CentOS 7",
+                  "architecture" => 64
+                },
+                {
+                  "id" => "81504C620D98BCEB5646987545203B42",
+                  "name" => "Recovery image name",
+                  "available_datacenters" => [
+                    "DA41201B4A006EDE6DA62A5A62A658E7",
+                    "47FA5A2D251AE57935E30F9D5AB4F817",
+                    "7C5FA1D21B98DE39D7516333AAB7DA54"
+                  ],
+                  "os_family" => "Windows",
+                  "os" => "Windows",
+                  "os_version" => "Windows 2012",
+                  "architecture" => 64
+                }
               ]
             }
           end

data/lib/oneandone/models/compute/baremetal_model.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Compute
+    class OneAndOne
+      class BaremetalModel < Fog::Model
+
+        # Declare Model Attributes
+        identity  :id
+
+        attribute :name
+        attribute :hardware
+
+      end # BaremetalModel
+    end # OneAndOne
+  end # Compute
+end # Fog

data/lib/oneandone/models/compute/baremetal_models.rb

@@ -0,0 +1,24 @@
+require_relative 'baremetal_model'
+
+module Fog
+  module Compute
+    class OneAndOne
+      class BaremetalModels < Fog::Collection
+        model Fog::Compute::OneAndOne::BaremetalModel
+
+        def all
+          response = service.list_baremetal_models
+          load(response.body)
+        end
+
+        def get(id)
+          response = service.get_server(id)
+          new(response.body)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end # BaremetalModels
+    end # OneAndOne
+  end # Compute
+end # Fog

data/lib/oneandone/models/compute/block_storage.rb

@@ -0,0 +1,100 @@
+module Fog
+  module Compute
+    class OneAndOne
+      class BlockStorage < Fog::Model
+
+        # Declare Model Attributes
+        identity  :id
+
+        attribute :size
+        attribute :state
+        attribute :description
+        attribute :name
+        attribute :datacenter_id
+        attribute :datacenter
+        attribute :creation_date
+        attribute :server
+        attribute :server_id
+
+        
+        def save
+
+          # Perform Request
+          response = service.create_block_storage(name: name, size: size,
+            description: description, datacenter_id: datacenter_id,
+            server_id: server_id)
+
+          # Merge Attributes
+          merge_attributes(response.body)
+
+          true
+
+        end
+
+
+        def update(options = {})
+
+          requires :id
+
+          response = service.update_block_storage(block_storage_id: id,
+            name: options[:name], description: options[:description],
+            size: options[:size])
+
+          # Merge Attributes
+          merge_attributes(response.body)
+
+          true
+
+        end
+
+
+        def add_server(options = {})
+
+          requires :id
+
+          response = service.add_block_storage_server(block_storage_id: id,
+            server_id: options[:server_id])
+
+          # Merge Attributes
+          merge_attributes(response.body)
+
+          true
+
+        end
+
+
+        def remove_server()
+
+          requires :id
+
+          response = service.remove_block_storage_server(block_storage_id: id)
+
+          # Merge Attributes
+          merge_attributes(response.body)
+
+          true
+
+        end
+
+
+        def destroy
+
+          requires :id
+
+          service.delete_block_storage(id)
+          
+          true
+
+        end
+
+
+        def ready?
+
+          state == 'POWERED_ON'
+
+        end
+
+      end # BlockStorage
+    end # OneAndOne
+  end # Compute
+end # Fog