fog-oraclecloud 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5dc7f1557e8c37f5f2f8a1970b80eb36785a77
-  data.tar.gz: 28c71f5e220187f8ab8bad9a5cbf7779c6c30736
+  metadata.gz: e26158d660439a6c29046eda1a67a5a7c2361fb2
+  data.tar.gz: af30c4a641467086dbcef181fc79470898767e39
 SHA512:
-  metadata.gz: 083b3e775808dbe63a9fe1ccb690aa46e7c71443a5c66a19294bea8250b4d97daddd0925e7da3aa5ffd36a8a21528488e94094e30db63a4003668260658289ff
-  data.tar.gz: c62eaf8a025bc0864e8df9f830e51f2401a01091ebabbc4ebdd14629d6a702edee6782d945e7514499ee0a12efa61d420547f4a06ac0bb7e35e90ffb9994b01b
+  metadata.gz: 37f66b5e65edb56dd33db39336e1ef96bc9034291f4fb0e5117608e70e3d68ddabcd20a2e1be8c46fa618efe2eb814c7a2e436abe783b3623a9f1e9f927ee4d6
+  data.tar.gz: 9d96a9c26db2629bc43440ac21a440d2681fe4c99651d75ff89f67e3e21da88ac0a3cc6f164f9d9c9c20de03b4be883777ab08aa57b84e4ce0b5d964299540d0

data/fog-oracle.gemspec

@@ -22,11 +22,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "shindo", "~> 0.3"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "byebug", '~>9.0'
 
   spec.add_dependency 'fog-core',   '~> 1.38'
   spec.add_dependency 'fog-json',   '~>1.0'
   spec.add_dependency 'fog-xml',    '~>0.1'
   spec.add_dependency 'ipaddress',  '~>0.8'
-  spec.add_dependency 'mime-types'
+  spec.add_dependency 'mime-types', '~>3.1'
+  spec.add_dependency 'activesupport', '~>5.0'
 end

data/lib/fog/oraclecloud/compute.rb

@@ -33,6 +33,14 @@ module Fog
       model :volume
       collection :volumes
 
+      model :ip_reservation
+      collection :ip_reservations
+      model :ip_network
+      collection :ip_networks
+
+      model :storage_attachment
+      collection :storage_attachments
+
 			request_path 'fog/oraclecloud/requests/compute'
      	request :list_security_applications
      	request :create_security_application
@@ -79,6 +87,21 @@ module Fog
       request :list_volumes
       request :create_volume
 
+      request :list_ip_reservations
+      request :get_ip_reservation
+      request :create_ip_reservation
+      request :delete_ip_reservation
+      request :update_ip_reservation
+
+      request :list_ip_networks
+      request :get_ip_network
+      request :create_ip_network
+      request :delete_ip_network
+
+      request :list_storage_attachments
+      request :get_storage_attachment
+      request :create_storage_attachment
+
 			class Real
 
       	def initialize(options={})
@@ -126,11 +149,13 @@ module Fog
 					rescue Excon::Errors::HTTPStatusError => error
 						raise case error
 						when Excon::Errors::NotFound
+              puts "not found"
 							Fog::Compute::OracleCloud::NotFound.slurp(error)
 						when Excon::Errors::Conflict
 							data = Fog::JSON.decode(error.response.body)
 							raise Error.new(data['message'])
 						else
+              puts "else"
 							error
 						end
 					end
@@ -155,6 +180,9 @@ module Fog
             :instances => {},
             :sshkeys => {},
             :orchestrations => {},
+            :ip_reservations => {},
+            :ip_networks => {},
+            :storage_attachments => {},
             :image_lists => {
               "/oracle/public/Oracle_Linux_7" => {
                 "name" => "/oracle/public/Oracle_Linux_7",

data/lib/fog/oraclecloud/models/compute/ip_network.rb

@@ -0,0 +1,51 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class IpNetwork < Fog::Model
+	      identity  :name
+
+	      attribute :uri
+	      attribute :description
+	      attribute :tags
+	      attribute :ip_address_prefix,        :aliases=>'ipAddressPrefix'
+	      attribute :ip_network_exchange,      :aliases=>'ipNetworkExchange'
+	      attribute :public_napt_enabled_flag, :aliases=>'publicNaptEnabledFlag'
+
+ 				def save
+          requires :name, :ip_address_prefix
+ 					if !name.nil? && !name.start_with?("/Compute-") then
+	          create
+	         else
+	         	update
+	        end
+        end
+
+        def create 
+          data = service.create_ip_network({
+          	:name => name,
+          	:ipAddressPrefix => ip_address_prefix, 
+          	:ipNetworkExchange => ip_network_exchange,
+          })
+          merge_attributes(data.body)
+        end
+
+        def update
+        	data = service.update_ip_network({
+            :name => name,
+            :ipAddressPrefix => ip_address_prefix, 
+            :ipNetworkExchange => ip_network_exchange,
+        	})
+        	merge_attributes(data.body)
+        end
+
+        def destroy
+        	requires :name
+        	service.delete_ip_network(name)
+        end
+
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/compute/ip_networks.rb

@@ -0,0 +1,22 @@
+require 'fog/core/collection'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class IpNetworks < Fog::Collection
+
+	    	model Fog::Compute::OracleCloud::IpNetwork
+				
+				def all
+					data = service.list_ip_networks().body['result']
+					load(data)
+				end
+
+ 				def get(name)
+          data = service.get_ip_network(name).body
+          new(data)
+        end
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/compute/ip_reservation.rb

@@ -0,0 +1,54 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class IpReservation < Fog::Model
+	      identity  :name
+
+	      attribute :account
+	      attribute :ip
+	      attribute :parentpool
+	      attribute :permanent
+	      attribute :quota
+	      attribute :tags
+	      attribute :uri
+	      attribute :used
+
+ 				def save
+ 					if !name.nil? && !name.start_with?("/Compute-") then
+	          create
+	         else
+	         	update
+	        end
+        end
+
+        def create 
+          data = service.create_ip_reservation({
+          	:name => name,
+          	:parentpool => parentpool || '/oracle/public/ippool', 
+          	:permanent => permanent || true,
+          	:tags => tags
+          })
+          merge_attributes(data.body)
+        end
+
+        def update
+        	data = service.update_ip_reservation({
+        		:name => name,
+        		:parentpool => parentpool,
+        		:permanent => permanent,
+        		:tags => tags
+        	})
+        	merge_attributes(data.body)
+        end
+
+        def destroy
+        	requires :name
+        	service.delete_ip_reservation(name)
+        end
+
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/compute/ip_reservations.rb

@@ -0,0 +1,22 @@
+require 'fog/core/collection'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class IpReservations < Fog::Collection
+
+	    	model Fog::Compute::OracleCloud::IpReservation
+				
+				def all
+					data = service.list_ip_reservations().body['result']
+					load(data)
+				end
+
+ 				def get(name)
+          data = service.get_ip_reservation(name).body
+          new(data)
+        end
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/compute/storage_attachment.rb

@@ -0,0 +1,41 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class StorageAttachment < Fog::Model
+	      identity  :uri
+
+	      attribute :account
+	      attribute :hypervisor
+	      attribute :index
+	      attribute :instance_name
+	      attribute :read_only,      :aliases=>'readonly'
+	      attribute :state
+        attribute :storage_volume_name
+        attribute :name
+
+        def save
+          #identity ? update : create
+          create
+        end
+
+        def create 
+          requires :index, :instance_name, :storage_volume_name
+          data = service.create_storage_attachment({
+          	:index => index,
+            :instance_name => instance_name,
+            :storage_volume_name => storage_volume_name,
+          })
+          merge_attributes(data.body)
+        end
+
+        def destroy
+        	requires :name
+        	service.delete_storage_container(name)
+        end
+
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/compute/storage_attachments.rb

@@ -0,0 +1,22 @@
+require 'fog/core/collection'
+
+module Fog
+  module Compute
+  	class OracleCloud
+	    class StorageAttachments < Fog::Collection
+
+	    	model Fog::Compute::OracleCloud::StorageAttachment
+				
+				def all
+					data = service.list_storage_attachments().body['result']
+					load(data)
+				end
+
+ 				def get(name)
+          data = service.get_storage_attachment(name).body
+          new(data)
+        end
+	    end
+	  end
+  end
+end

data/lib/fog/oraclecloud/models/java/access_rule.rb

@@ -0,0 +1,63 @@
+module Fog
+  module OracleCloud
+    class Java
+      class AccessRule < Fog::Model
+      	identity :rule_name,       :aliases=>'ruleName'
+
+      	attribute :description
+      	attribute :status
+      	attribute :source
+        attribute :destination
+        attribute :ports
+        attribute :protocol
+        attribute :rule_type,       :aliases=>'ruleType'
+
+        attribute :service_name
+      
+        def save
+          #identity ? update : create
+          create
+        end
+
+        def create
+          requires :description, :destination, :ports, :rule_name, :source, :status, :service_name
+
+          params = {
+            :ruleName => rule_name,
+            :description => description,
+            :ports => ports,
+            :status => status,
+            :destination => destination,
+            :protocol => protocol,
+            :ruleType => 'USER',
+            :source => source
+          }
+          service.create_access_rule(service_name, params)
+
+          Fog.wait_for { self.reload rescue nil } unless Fog.mock?
+        end
+
+        def destroy
+          requires :rule_name, :service_name
+          data = service.delete_access_rule(service_name, rule_name).body
+          merge_attributes(data)
+
+          Fog.wait_for { self.reload rescue nil } unless Fog.mock?
+
+        end
+
+        def enable
+          requires :rule_name, :service_name
+          data = service.enable_access_rule(service_name, rule_name).body
+          merge_attributes(data)
+        end
+
+        def disable
+          requires :rule_name, :service_name
+          data = service.disable_access_rule(service_name, rule_name).body
+          merge_attributes(data)
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/models/java/access_rules.rb

@@ -0,0 +1,32 @@
+require 'fog/core/collection'
+
+module Fog
+  module OracleCloud
+    class Java
+      class AccessRules < Fog::Collection
+        attribute :instance
+
+        model Fog::OracleCloud::Java::AccessRule
+
+        def all
+          data = service.list_access_rules(instance.service_name).body['accessRules']
+          load(data)
+        end
+
+        def get(rule_name)
+          data = service.list_access_rules(instance.service_name).body['accessRules']
+          rule = load(data).detect { |r| r.rule_name === rule_name }
+          if !rule.nil?
+            rule
+          else
+            raise Fog::OracleCloud::Java::NotFound.new("Access Rule #{rule_name} does not exist");
+          end
+        end
+
+        def new(attributes = {})
+          super({:service_name=>instance.service_name}.merge!(attributes))
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/models/monitoring/metrics_report.rb

@@ -0,0 +1,12 @@
+require 'fog/core/model'
+
+module Fog
+  module OracleCloud
+    class Monitoring
+      class MetricsReport < Fog::Model
+
+
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/models/monitoring/metrics_reports.rb

@@ -0,0 +1,24 @@
+require 'fog/core/collection'
+
+module Fog
+  module OracleCloud
+    class Monitoring
+      class MetricsReports < Fog::Collection
+
+      	model Fog::OracleCloud::Monitoring::MetricsReport
+
+      	def all
+          data = service.list_metrics_reports().body['items']
+          pp data
+          load(data)
+        end
+
+        def get(service_name)
+          new(service.get_instance(service_name).body)
+        end
+
+      end
+    end
+
+  end
+end