fog-oraclecloud 0.1.12 → 0.1.13

data/lib/fog/oraclecloud/requests/database/list_servers.rb

@@ -1,27 +1,27 @@
-module Fog
-  module OracleCloud
-    class Database
-      class Real
-      	def list_servers(db_name)
-          response = request(
-            :expects  => 200,
-            :method   => 'GET',
-            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{db_name}/servers"
-          )
-          response
-        end
-      end
-
-      class Mock
-        def list_servers(db_name)
-          response = Excon::Response.new
-
-          servers = self.data[:servers][db_name]
-
-          response.body = servers
-          response
-        end
-      end
-    end
-  end
-end
+module Fog
+  module OracleCloud
+    class Database
+      class Real
+      	def list_servers(db_name)
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{db_name}/servers"
+          )
+          response
+        end
+      end
+
+      class Mock
+        def list_servers(db_name)
+          response = Excon::Response.new
+
+          servers = self.data[:servers][db_name]
+
+          response.body = servers
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/database/list_snapshots.rb

@@ -1,27 +1,27 @@
-module Fog
-  module OracleCloud
-    class Database
-      class Real
-      	def list_snapshots(db_name)
-          response = request(
-            :expects  => 200,
-            :method   => 'GET',
-            :path     => "/paas/api/v1.1/instancemgmt/#{@identity_domain}/services/dbaas/instances/#{db_name}/snapshots"
-          )
-          response
-        end
-      end
-
-      class Mock
-        def list_snapshots(db_name)
-          response = Excon::Response.new
-
-          snapshots = self.data[:snapshots][db_name].values
-
-          response.body = snapshots
-          response
-        end
-      end
-    end
-  end
-end
+module Fog
+  module OracleCloud
+    class Database
+      class Real
+      	def list_snapshots(db_name)
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/paas/api/v1.1/instancemgmt/#{@identity_domain}/services/dbaas/instances/#{db_name}/snapshots"
+          )
+          response
+        end
+      end
+
+      class Mock
+        def list_snapshots(db_name)
+          response = Excon::Response.new
+
+          snapshots = self.data[:snapshots][db_name].values
+
+          response.body = snapshots
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/database/recover_instance.rb

@@ -1,83 +1,83 @@
-module Fog
-  module OracleCloud
-    class Database
-      class Real
-
-      	def recover_instance(service_name, type=nil, value=nil)
-          if type == 'latest' then body_data = { 'latest' => true } end
-          if type == 'tag' then body_data = { 'tag' => value } end
-          if type == 'timestamp' then body_data = { 'timestamp' => value } end
-          if type == 'scn' then body_data = { 'scn' => value } end
-        
-          response = request(
-            :method   => 'POST',
-            :expects  => 202,
-            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/backups/recovery",
-            :body     => Fog::JSON.encode(body_data),
-          )
-          response.database_id = service_name
-          response
-        end
-      end
-
-      class Mock
-        def recover_instance(service_name, type=nil, value=nil)
-      		response = Excon::Response.new
-
-          if !self.data[:recoveries][service_name].is_a? Array then 
-            self.data[:recoveries][service_name] = []
-          end
-
-          if !self.data[:created_at][:recoveries] 
-            self.data[:created_at][:recoveries] = {}
-            self.data[:created_at][:recoveries][service_name] = []
-          end
-
-          # Find the backup first
-          backups = self.data[:backups][service_name]
-          backup = nil
-          if type == 'tag' then
-            backup = backups.find { |b| b['dbTag'] = value }
-          elsif type == 'timestamp' then
-            # Too hard to do this logic in mock. Just return the latest
-            backup = backups.last
-          elsif type.nil? then
-            # Default to searching for the latest
-            backup = backups.last
-          end
-          if backup.nil? then
-            response.status = 500
-          else
-            if type == 'tag' then
-              self.data[:recoveries][service_name].push({
-                'recoveryStartDate'=>Time.now.strftime('%d-%b-%Y %H:%M:%S UTC'),
-                'status'=>'IN PROGRESS',
-                'dbTag'=>value,
-                'database_id' => service_name
-              })
-              self.data[:created_at][:recoveries][service_name].push(Time.now)
-            elsif type == 'timestamp' then
-              self.data[:recoveries][service_name].push({
-                'recoveryStartDate'=>Time.now.strftime('%d-%b-%Y %H:%M:%S UTC'),
-                'status'=>'IN PROGRESS',
-                'timestamp'=>value.strftime('%d-%b-%Y %H:%M:%S'),
-                'database_id' => service_name
-              })
-              self.data[:created_at][:recoveries][service_name].push(Time.now)
-            elsif type.nil? then
-              self.data[:recoveries][service_name].push({
-                'recoveryStartDate'=>Time.now.strftime('%d-%b-%Y %H:%M:%S UTC'),
-                'status'=>'IN PROGRESS',
-                'latest'=>true,
-                'database_id' => service_name
-              })
-              self.data[:created_at][:recoveries][service_name].push(Time.now)
-            end
-            response.status = 202
-          end
-          response
-      	end
-      end
-    end
-  end
-end
+module Fog
+  module OracleCloud
+    class Database
+      class Real
+
+      	def recover_instance(service_name, type=nil, value=nil)
+          if type == 'latest' then body_data = { 'latest' => true } end
+          if type == 'tag' then body_data = { 'tag' => value } end
+          if type == 'timestamp' then body_data = { 'timestamp' => value } end
+          if type == 'scn' then body_data = { 'scn' => value } end
+        
+          response = request(
+            :method   => 'POST',
+            :expects  => 202,
+            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{service_name}/backups/recovery",
+            :body     => Fog::JSON.encode(body_data),
+          )
+          response.database_id = service_name
+          response
+        end
+      end
+
+      class Mock
+        def recover_instance(service_name, type=nil, value=nil)
+      		response = Excon::Response.new
+
+          if !self.data[:recoveries][service_name].is_a? Array then 
+            self.data[:recoveries][service_name] = []
+          end
+
+          if !self.data[:created_at][:recoveries] 
+            self.data[:created_at][:recoveries] = {}
+            self.data[:created_at][:recoveries][service_name] = []
+          end
+
+          # Find the backup first
+          backups = self.data[:backups][service_name]
+          backup = nil
+          if type == 'tag' then
+            backup = backups.find { |b| b['dbTag'] = value }
+          elsif type == 'timestamp' then
+            # Too hard to do this logic in mock. Just return the latest
+            backup = backups.last
+          elsif type.nil? then
+            # Default to searching for the latest
+            backup = backups.last
+          end
+          if backup.nil? then
+            response.status = 500
+          else
+            if type == 'tag' then
+              self.data[:recoveries][service_name].push({
+                'recoveryStartDate'=>Time.now.strftime('%d-%b-%Y %H:%M:%S UTC'),
+                'status'=>'IN PROGRESS',
+                'dbTag'=>value,
+                'database_id' => service_name
+              })
+              self.data[:created_at][:recoveries][service_name].push(Time.now)
+            elsif type == 'timestamp' then
+              self.data[:recoveries][service_name].push({
+                'recoveryStartDate'=>Time.now.strftime('%d-%b-%Y %H:%M:%S UTC'),
+                'status'=>'IN PROGRESS',
+                'timestamp'=>value.strftime('%d-%b-%Y %H:%M:%S'),
+                'database_id' => service_name
+              })
+              self.data[:created_at][:recoveries][service_name].push(Time.now)
+            elsif type.nil? then
+              self.data[:recoveries][service_name].push({
+                'recoveryStartDate'=>Time.now.strftime('%d-%b-%Y %H:%M:%S UTC'),
+                'status'=>'IN PROGRESS',
+                'latest'=>true,
+                'database_id' => service_name
+              })
+              self.data[:created_at][:recoveries][service_name].push(Time.now)
+            end
+            response.status = 202
+          end
+          response
+      	end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/database/scale_instance.rb

@@ -1,40 +1,40 @@
-module Fog
-  module OracleCloud
-    class Database
-      class Real
-
-      	def scale_instance(name, options={})
-          body_data     = {
-            'shape'             => options[:shape],
-            'additionalStorage' => options[:additional_storage],
-            'usage'             => options[:usage]
-          }
-          body_data = body_data.reject {|key, value| value.nil?}
-        
-          request(
-            :method   => 'PUT',
-            :expects  => 202,
-            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{name}",
-            :body     => Fog::JSON.encode(body_data),
-          )
-        end
-      end
-
-      class Mock
-        def scale_instance(name, options={})
-      		response = Excon::Response.new
-
-          self.data[:instances][name]['status'] = 'Maintenance'
-          info = { 'time'=> Time.now }
-          if (options[:shape]) then
-            info['attribute'] = 'shape'
-            info['value'] = options[:shape]
-          end
-          self.data[:maintenance_at][name] = info
-          response.status = 202
-          response
-      	end
-      end
-    end
-  end
-end
+module Fog
+  module OracleCloud
+    class Database
+      class Real
+
+      	def scale_instance(name, options={})
+          body_data     = {
+            'shape'             => options[:shape],
+            'additionalStorage' => options[:additional_storage],
+            'usage'             => options[:usage]
+          }
+          body_data = body_data.reject {|key, value| value.nil?}
+        
+          request(
+            :method   => 'PUT',
+            :expects  => 202,
+            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{name}",
+            :body     => Fog::JSON.encode(body_data),
+          )
+        end
+      end
+
+      class Mock
+        def scale_instance(name, options={})
+      		response = Excon::Response.new
+
+          self.data[:instances][name]['status'] = 'Maintenance'
+          info = { 'time'=> Time.now }
+          if (options[:shape]) then
+            info['attribute'] = 'shape'
+            info['value'] = options[:shape]
+          end
+          self.data[:maintenance_at][name] = info
+          response.status = 202
+          response
+      	end
+      end
+    end
+  end
+end

data/lib/fog/oraclecloud/requests/java/create_instance.rb

@@ -1,87 +1,156 @@
-module Fog
-  module OracleCloud
-    class Java
-      class Real
-
-        def create_instance(config, options)
-          
-          if !config[:cloudStorageContainer].start_with?("/Storage-")
-            config[:cloudStorageContainer] = "/Storage-#{@identity_domain}/#{config[:cloudStorageContainer]}"
-          end
-
-          config[:parameters] = options.select{|key, value| [:adminPassword, :adminPort, :adminUserName, :backupVolumeSize, :clusterName, :contentPort, :dbaName, :dbaPassword, :dbServiceName, :deploymentChannelPort, :domainMode, :domainName, :domainPartitionCount, :domainVolumeSize, :edition, :ipReservations, :managedServerCount, :msInitialHeapMB, :msJvmArgs, :msMaxHeapMB, :msMaxPermMB, :msPermMb, :nodeManagerPassword, :nodeManagerPort, :nodeManagerUserName, :overwriteMsJvmArgs, :pdbName, :securedAdminPort, :securedContentPort, :shape, :VMsPublicKey].include?(key)}
-          config[:parameters].reject! { |key,value| value.nil?}
-          config.reject! { |key,value| value.nil?}
-          # Currently only support weblogic
-          config[:parameters][:type] = "weblogic"
-
-          body_data = config
-
-          request(
-            :method   => 'POST',
-            :expects  => 202,
-            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}",
-            :body     => Fog::JSON.encode(body_data),
-            #:headers  => {
-            # 'Content-Type'=>'application/vnd.com.oracle.oracloud.provisioning.Service+json'
-            #}
-          )
-        end
-      end
-      class Mock
-        def create_instance(config, options)
-          response = Excon::Response.new
-
-          ip = '192.168.1.1'
-          data = {
-            'status' => 'In Progress',
-            'compute_site_name' => 'EM002_Z11',
-            'content_url' => "http://#{ip}",
-            'created_by' => @username,
-            'creation_job_id' => Random.rand(100000),
-            'creation_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
-            'db_info' => "#{options[:dbServiceName]}:1521/#{options[:pdbName] || 'PDB1'}.#{@identity_domain}.oraclecloud.internal",
-            'deletion_job_id' => 0,
-            'domainMode'=>'DEVELOPMENT',
-            'fmw_control_url'=> "https://#{ip}:#{options[:adminPort] || 7002}/em",
-            'last_modified_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
-            'num_ip_reservations'=> 2, # Can't rely on this number in mocking mode
-            'num_nodes'=>options[:managedServerCount],
-            'otd_provisioned'=>options[:provisionOTD] || 'no',
-            'psm_plugin_version'=>"16.3.5-532",
-            'secure_content_url' => "https://#{ip}",
-            'service_type'=>'jaas',
-            'service_uri'=>"#{@region_url}/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{config[:serviceName]}",
-            'wls_admin_url'=> "https://#{ip}:#{options[:adminPort] || 7002}/console",
-            'wls_deployment_channel_port' => options[:deploymentChannelPort] || 9001,
-            'wlsVersion'=>'12.2.1.0.160419'
-          }
-            .merge(config.select {|key, value| [:serviceName, :description, :level, :subscriptionType].include?(key) })
-            .merge(options.select {|key, value| [:clusterName, :dbServiceName, :edition, :shape, :version].include?(key) }).collect{|k,v| [k.to_s, v]}.to_h
-
-          if data['clusterName'].nil? then data['clusterName'] = data['serviceName'][0,8] + "_cluster" end
-          if data['domainName'].nil? then data['domainName'] = data['serviceName'][0,8] + "_domain" end
-          self.data[:instances][config[:serviceName]] = data
-          self.data[:created_at][config[:serviceName]] = Time.now
-
-          server = {
-            "clusterName": data['clusterName'] || data['serviceName'][0,8] + "_cluster",
-            "name": "#{data['serviceName'][0,8]}_server_1",
-            "shape": data['shape'],
-            "nodeType": "WLS",
-            "isAdmin": true,
-            "hostname": ip,
-            "status": "Ready",
-            "storageAllocated": 74752,
-            "creationDate": Time.now.strftime('%Y-%b-%dT%H:%M:%S')
-          }
-          self.data[:servers][data['serviceName']] = {}
-          self.data[:servers][data['serviceName']][server[:name]] = server
-
-          response.status = 202
-          response
-        end
-      end
-    end
-  end
-end
+module Fog
+  module OracleCloud
+    class Java
+      class Real
+
+        def create_instance(config, options)
+          
+          if !config[:cloudStorageContainer].start_with?("/Storage-")
+            config[:cloudStorageContainer] = "/Storage-#{@identity_domain}/#{config[:cloudStorageContainer]}"
+          end
+
+          config[:parameters] = options.select{|key, value| [:adminPassword, :adminPort, :adminUserName, :backupVolumeSize, :clusterName, :contentPort, :dbaName, :dbaPassword, :dbServiceName, :deploymentChannelPort, :domainMode, :domainName, :domainPartitionCount, :domainVolumeSize, :edition, :ipReservations, :managedServerCount, :msInitialHeapMB, :msJvmArgs, :msMaxHeapMB, :msMaxPermMB, :msPermMb, :nodeManagerPassword, :nodeManagerPort, :nodeManagerUserName, :overwriteMsJvmArgs, :pdbName, :securedAdminPort, :securedContentPort, :shape, :VMsPublicKey].include?(key)}
+          config[:parameters].reject! { |key,value| value.nil?}
+          config.reject! { |key,value| value.nil?}
+          # Currently only support weblogic
+          config[:parameters][:type] = "weblogic"
+
+          body_data = config
+
+          request(
+            :method   => 'POST',
+            :expects  => 202,
+            :path     => "/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}",
+            :body     => Fog::JSON.encode(body_data),
+            #:headers  => {
+            # 'Content-Type'=>'application/vnd.com.oracle.oracloud.provisioning.Service+json'
+            #}
+          )
+        end
+      end
+      class Mock
+        def create_instance(config, options)
+          response = Excon::Response.new
+
+          ip = '192.168.1.1'
+          data = {
+            'status' => 'In Progress',
+            'compute_site_name' => 'EM002_Z11',
+            'content_url' => "http://#{ip}",
+            'created_by' => @username,
+            'creation_job_id' => Random.rand(100000),
+            'creation_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
+            'db_info' => "#{options[:dbServiceName]}:1521/#{options[:pdbName] || 'PDB1'}.#{@identity_domain}.oraclecloud.internal",
+            'deletion_job_id' => 0,
+            'domainMode'=>'DEVELOPMENT',
+            'fmw_control_url'=> "https://#{ip}:#{options[:adminPort] || 7002}/em",
+            'last_modified_time'=> Time.now.strftime('%Y-%b-%dT%H:%M:%S'),
+            'num_ip_reservations'=> 2, # Can't rely on this number in mocking mode
+            'num_nodes'=>options[:managedServerCount],
+            'otd_provisioned'=>options[:provisionOTD] || 'no',
+            'psm_plugin_version'=>"16.3.5-532",
+            'secure_content_url' => "https://#{ip}",
+            'service_type'=>'jaas',
+            'service_uri'=>"#{@region_url}/paas/service/dbcs/api/v1.1/instances/#{@identity_domain}/#{config[:serviceName]}",
+            'wls_admin_url'=> "https://#{ip}:#{options[:adminPort] || 7002}/console",
+            'wls_deployment_channel_port' => options[:deploymentChannelPort] || 9001,
+            'wlsVersion'=>'12.2.1.0.160419'
+          }
+            .merge(config.select {|key, value| [:serviceName, :description, :level, :subscriptionType].include?(key) })
+            .merge(options.select {|key, value| [:clusterName, :dbServiceName, :edition, :shape, :version].include?(key) }).collect{|k,v| [k.to_s, v]}.to_h
+
+          if data['clusterName'].nil? then data['clusterName'] = data['serviceName'][0,8] + "_cluster" end
+          if data['domainName'].nil? then data['domainName'] = data['serviceName'][0,8] + "_domain" end
+          self.data[:instances][config[:serviceName]] = data
+          self.data[:created_at][config[:serviceName]] = Time.now
+
+          server = {
+            "clusterName": data['clusterName'] || data['serviceName'][0,8] + "_cluster",
+            "name": "#{data['serviceName'][0,8]}_server_1",
+            "shape": data['shape'],
+            "nodeType": "WLS",
+            "isAdmin": true,
+            "hostname": ip,
+            "status": "Ready",
+            "storageAllocated": 74752,
+            "creationDate": Time.now.strftime('%Y-%b-%dT%H:%M:%S')
+          }
+          self.data[:servers][data['serviceName']] = {}
+          self.data[:servers][data['serviceName']][server[:name]] = server
+
+
+          # Add default access rules
+          access_rules = [{
+            "ruleName" => "sys_ms2db_dblistener",
+            "description"=> "DO NOT MODIFY=> Permit listener connection to database from managed servers",
+            "status"=> "enabled",
+            "source"=> "WLS_MANAGED_SERVER",
+            "destination"=> "dbaas=>nbnws=>DB",
+            "ports"=> "1521",
+            "protocol"=> "tcp",
+            "ruleType"=> "SYSTEM"
+          },{
+            "ruleName"=> "sys_ms2db_ssh",
+            "description"=> "DO NOT MODIFY=> Permit managed servers to ssh to db",
+            "status"=> "enabled",
+            "source"=> "WLS_MANAGED_SERVER",
+            "destination"=> "dbaas=>nbnws=>DB",
+            "port"=> "22",
+            "portocol"=> "tcp",
+            "ruleType"=> "SYSTEM"
+          },{
+            "ruleName"=> "ora_p2admin_ssh",
+            "description"=> "DO NOT MODIFY=> Permit public ssh to admin server",
+            "status"=> "enabled",
+            "source"=> "PUBLIC-INTERNET",
+            "destination"=> "WLS_ADMIN_SERVER",
+            "port"=> "22",
+            "portocol"=> "tcp",
+            "ruleType"=> "DEFAULT"
+          },{
+            "ruleName"=> "ora_p2admin_ahttps",
+            "description"=> "DO NOT MODIFY=> Permit public to https to admin server",
+            "status"=> "enabled",
+            "source"=> "PUBLIC-INTERNET",
+            "destination"=> "WLS_ADMIN_SERVER",
+            "port"=> "7002",
+            "portocol"=> "tcp",
+            "ruleType"=> "DEFAULT"
+          },{
+            "ruleName"=> "sys_infra2admin_ssh",
+            "description"=> "DO NOT MODIFY=> Permit PSM to ssh to admin server",
+            "status"=> "enabled",
+            "source"=> "PAAS-INFRA",
+            "destination"=> "WLS_ADMIN_SERVER",
+            "port"=> "22",
+            "portocol"=> "tcp",
+            "ruleType"=> "DEFAULT"
+          },{
+            "ruleName"=> "ora_p2ms_chttp",
+            "description"=> "Permit http connection to managed servers from public",
+            "status"=> "enabled",
+            "source"=> "PUBLIC-INTERNET",
+            "destination"=> "WLS_ADMIN_SERVER",
+            "port"=> "80",
+            "portocol"=> "tcp",
+            "ruleType"=> "DEFAULT"
+          },{
+            "ruleName"=> "ora_p2ms_chttps",
+            "description"=> "Permit https connection to managed servers from public",
+            "status"=> "enabled",
+            "source"=> "PUBLIC-INTERNET",
+            "destination"=> "WLS_MANAGED_SERVER",
+            "port"=> "443",
+            "portocol"=> "tcp",
+            "ruleType"=> "DEFAULT"
+          }]
+
+          self.data[:access_rules][data['serviceName']] = access_rules
+
+          response.status = 202
+          response
+        end
+      end
+    end
+  end
+end