morpheus-cli 5.3.4 → 5.4.3

data/lib/morpheus/api/network_servers_interface.rb

@@ -11,10 +11,10 @@ class Morpheus::NetworkServersInterface < Morpheus::RestInterface
     execute(method: :get, url: "#{base_path}/#{server_id}/scopes", params: params, headers: headers)
   end
 
-  def get_scope(server_id, scope_id, params={}, headers={})
+  def get_scope(server_id, id, params={}, headers={})
     validate_id!(server_id)
-    validate_id!(scope_id)
-    execute(method: :get, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", params: params, headers: headers)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/scopes/#{id}", params: params, headers: headers)
   end
 
   def create_scope(server_id, payload, params={}, headers={})
@@ -22,21 +22,77 @@ class Morpheus::NetworkServersInterface < Morpheus::RestInterface
     execute(method: :post, url: "#{base_path}/#{server_id}/scopes", params: params, payload: payload, headers: headers)
   end
 
-  def update_scope(server_id, scope_id, payload, params={}, headers={})
+  def update_scope(server_id, id, payload, params={}, headers={})
     validate_id!(server_id)
-    validate_id!(scope_id)
-    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", params: params, payload: payload, headers: headers)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{id}", params: params, payload: payload, headers: headers)
   end
 
-  def destroy_scope(server_id, scope_id, params={}, headers={})
+  def destroy_scope(server_id, id, params={}, headers={})
     validate_id!(server_id)
-    validate_id!(scope_id)
-    execute(method: :delete, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", params: params, headers: headers)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/scopes/#{id}", params: params, headers: headers)
   end
 
-  def update_scope_permissions(server_id, scope_id, payload, params={}, headers={})
+  def update_scope_permissions(server_id, id, payload, params={}, headers={})
     validate_id!(server_id)
-    validate_id!(scope_id)
-    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", payload: payload.to_json, params: params, headers: headers)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{id}", payload: payload.to_json, params: params, headers: headers)
+  end
+
+  def list_firewall_rules(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rules", params: params, headers: headers)
+  end
+
+  def get_firewall_rule(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rules/#{id}", params: params, headers: headers)
+  end
+
+  def create_firewall_rule(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/firewall-rules", params: params, payload: payload, headers: headers)
+  end
+
+  def update_firewall_rule(server_id, id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/firewall-rules/#{id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy_firewall_rule(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/firewall-rules/#{id}", params: params, headers: headers)
+  end
+
+  def list_firewall_rule_groups(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rule-groups", params: params, headers: headers)
+  end
+
+  def get_firewall_rule_group(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rule-groups/#{id}", params: params, headers: headers)
+  end
+
+  def create_firewall_rule_group(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/firewall-rule-groups", params: params, payload: payload, headers: headers)
+  end
+
+  def update_firewall_rule_group(server_id, id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/firewall-rule-groups/#{id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy_firewall_rule_group(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/firewall-rule-groups/#{id}", params: params, headers: headers)
   end
 end

data/lib/morpheus/api/network_static_routes_interface.rb

@@ -0,0 +1,36 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkStaticRoutesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks"
+  end
+
+  def get_static_route(network_id, route_id, params={}, headers={})
+    validate_id!(network_id)
+    validate_id!(route_id)
+    execute(method: :get, url: "#{base_path}/#{network_id}/routes/#{route_id}", params: params, headers: headers)
+  end
+
+  def list_static_routes(network_id, params={}, headers={})
+    validate_id!(network_id)
+    execute(method: :get, url: "#{base_path}/#{network_id}/routes", params: params, headers: headers)
+  end
+
+  def create_static_route(network_id, payload, params={}, headers={})
+    validate_id!(network_id)
+    execute(method: :post, url: "#{base_path}/#{network_id}/routes", params: params, payload: payload, headers: headers)
+  end
+
+  def update_static_route(network_id, route_id, payload, params={}, headers={})
+    validate_id!(network_id)
+    validate_id!(route_id)
+    execute(method: :put, url: "#{base_path}/#{network_id}/routes/#{route_id}", params: params, payload: payload, headers: headers)
+  end
+
+  def delete_static_route(network_id, route_id, params={}, headers={})
+    validate_id!(network_id)
+    validate_id!(route_id)
+    execute(method: :delete, url: "#{base_path}/#{network_id}/routes/#{route_id}", params: params, headers: headers)
+  end
+end

data/lib/morpheus/api/ping_interface.rb

@@ -14,6 +14,8 @@ class Morpheus::PingInterface < Morpheus::APIClient
 
   def get(params={})
     headers = {params: params}
+    # use access token if authenticated
+    headers[:authorization] = "Bearer #{@access_token}" if @access_token
     execute(method: :get, url: "/api/ping", headers: headers)
   end
 

data/lib/morpheus/api/read_interface.rb

@@ -6,9 +6,10 @@ require 'morpheus/api/api_client'
 class Morpheus::ReadInterface < Morpheus::APIClient
 
   # subclasses should override in your interface
-  # Example: "/api/thing-types"
+  # Example: "/api/things"
   def base_path
-    raise "#{self.class} has not defined base_path!"
+    raise "#{self.class} has not defined base_path!" if @options[:base_path].nil?
+    @options[:base_path]
   end
 
   def list(params={}, headers={})
@@ -17,7 +18,7 @@ class Morpheus::ReadInterface < Morpheus::APIClient
 
   def get(id, params={}, headers={})
     validate_id!(id)
-    execute(method: :get, url: "#{base_path}/#{id}", params: params, headers: headers)
+    execute(method: :get, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, headers: headers)
   end
 
 end

data/lib/morpheus/api/rest_interface.rb

@@ -17,7 +17,7 @@ class Morpheus::RestInterface < Morpheus::APIClient
 
   def get(id, params={}, headers={})
     validate_id!(id)
-    execute(method: :get, url: "#{base_path}/#{id}", params: params, headers: headers)
+    execute(method: :get, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, headers: headers)
   end
 
   def create(payload, params={}, headers={})
@@ -26,12 +26,12 @@ class Morpheus::RestInterface < Morpheus::APIClient
 
   def update(id, payload, params={}, headers={})
     validate_id!(id)
-    execute(method: :put, url: "#{base_path}/#{id}", params: params, payload: payload, headers: headers)
+    execute(method: :put, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, payload: payload, headers: headers)
   end
 
   def destroy(id, params = {}, headers={})
     validate_id!(id)
-    execute(method: :delete, url: "#{base_path}/#{id}", params: params, headers: headers)
+    execute(method: :delete, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, headers: headers)
   end
 
 end

data/lib/morpheus/api/roles_interface.rb

@@ -92,6 +92,13 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def update_report_type(account_id, id, options)
+    url = build_url(account_id, id) + "/update-report-type"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
   private
 
   def build_url(account_id=nil, role_id=nil)

data/lib/morpheus/api/secondary_read_interface.rb

@@ -19,7 +19,7 @@ class Morpheus::SecondaryReadInterface < Morpheus::APIClient
   def get(resource_id, id, params={}, headers={})
     validate_id!(resource_id)
     validate_id!(id)
-    execute(method: :get, url: "#{base_path(resource_id)}/#{id}", params: params, headers: headers)
+    execute(method: :get, url: "#{base_path(resource_id)}/#{CGI::escape(id.to_s)}", params: params, headers: headers)
   end
 
 end

data/lib/morpheus/api/secondary_rest_interface.rb

@@ -2,41 +2,41 @@ require 'morpheus/api/api_client'
 
 # Interface class to be subclassed by interfaces that provide CRUD endpoints
 # for objects underneath another resource
-# Subclasses must override the base_path(resource_id) method
+# Subclasses must override the base_path(parent_id) method
 class Morpheus::SecondaryRestInterface < Morpheus::APIClient
 
   # subclasses should override in your interface
-  # Example: "/api/things/#{resource_id}/widgets"
-  def base_path(resource_id)
-    raise "#{self.class} has not defined base_path(resource_id)!"
+  # Example: "/api/things/#{parent_id}/widgets"
+  def base_path(parent_id)
+    raise "#{self.class} has not defined base_path(parent_id)!"
   end
 
-  def list(resource_id, params={}, headers={})
-    validate_id!(resource_id)
-    execute(method: :get, url: "#{base_path(resource_id)}", params: params, headers: headers)
+  def list(parent_id, params={}, headers={})
+    validate_id!(parent_id)
+    execute(method: :get, url: "#{base_path(parent_id)}", params: params, headers: headers)
   end
 
-  def get(resource_id, id, params={}, headers={})
-    validate_id!(resource_id)
+  def get(parent_id, id, params={}, headers={})
+    validate_id!(parent_id)
     validate_id!(id)
-    execute(method: :get, url: "#{base_path(resource_id)}/#{id}", params: params, headers: headers)
+    execute(method: :get, url: "#{base_path(parent_id)}/#{CGI::escape(id.to_s)}", params: params, headers: headers)
   end
 
-  def create(resource_id, payload, params={}, headers={})
-    validate_id!(resource_id)
-    execute(method: :post, url: "#{base_path(resource_id)}", params: params, payload: payload, headers: headers)
+  def create(parent_id, payload, params={}, headers={})
+    validate_id!(parent_id)
+    execute(method: :post, url: "#{base_path(parent_id)}", params: params, payload: payload, headers: headers)
   end
 
-  def update(resource_id, id, payload, params={}, headers={})
-    validate_id!(resource_id)
+  def update(parent_id, id, payload, params={}, headers={})
+    validate_id!(parent_id)
     validate_id!(id)
-    execute(method: :put, url: "#{base_path(resource_id)}/#{id}", params: params, payload: payload, headers: headers)
+    execute(method: :put, url: "#{base_path(parent_id)}/#{CGI::escape(id.to_s)}", params: params, payload: payload, headers: headers)
   end
 
-  def destroy(resource_id, id, params = {}, headers={})
-    validate_id!(resource_id)
+  def destroy(parent_id, id, params = {}, headers={})
+    validate_id!(parent_id)
     validate_id!(id)
-    execute(method: :delete, url: "#{base_path(resource_id)}/#{id}", params: params, headers: headers)
+    execute(method: :delete, url: "#{base_path(parent_id)}/#{CGI::escape(id.to_s)}", params: params, headers: headers)
   end
 
 end

data/lib/morpheus/api/setup_interface.rb

@@ -14,12 +14,16 @@ class Morpheus::SetupInterface < Morpheus::APIClient
 
   def get(params={})
     headers = {params: params}
+    # use access token if authenticated
+    headers[:authorization] = "Bearer #{@access_token}" if @access_token
     execute(method: :get, url: "/api/setup", headers: headers)
   end
 
   #this should go away and just use 
   def check(params={}, timeout=5)
     headers = {params: params}
+    # use access token if authenticated
+    headers[:authorization] = "Bearer #{@access_token}" if @access_token
     execute(method: :get, url: "/api/setup/check", headers: headers, timeout: timeout)
   end
 

data/lib/morpheus/api/snapshots_interface.rb

@@ -0,0 +1,19 @@
+require 'morpheus/api/api_client'
+
+# Snapshots API interface.
+class Morpheus::SnapshotsInterface < Morpheus::APIClient
+
+  def get(snapshot_id)
+    url = "#{@base_url}/api/snapshots/#{snapshot_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def remove(snapshot_id, payload={})
+    url = "#{@base_url}/api/snapshots/#{snapshot_id}"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+end

data/lib/morpheus/api/storage_server_types_interface.rb

@@ -0,0 +1,14 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::StorageServerTypesInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/storage-server-types"
+  end
+
+  # def option_types(id, params={}, headers={})
+  #   validate_id!(id)
+  #   execute(method: :get, url: "#{base_path}/#{id}/option-types", params: params, headers: headers)
+  # end
+
+end

data/lib/morpheus/api/storage_servers_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::StorageServersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/storage-servers"
+  end
+
+end

data/lib/morpheus/api/storage_volume_types_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::StorageVolumeTypesInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/storage-volume-types"
+  end
+
+end

data/lib/morpheus/api/storage_volumes_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::StorageVolumesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/storage-volumes"
+  end
+
+end

data/lib/morpheus/api/users_interface.rb

@@ -1,78 +1,31 @@
-require 'morpheus/api/api_client'
+require 'morpheus/api/rest_interface'
 
-class Morpheus::UsersInterface < Morpheus::APIClient
+class Morpheus::UsersInterface < Morpheus::RestInterface
 
-  def get(account_id, id, params={})
-    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = build_url(account_id, id)
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, timeout: 10, headers: headers}
-    execute(opts)
+  def base_path
+    "/api/users"
   end
 
-  def list(account_id, params={})
-    url = build_url(account_id)
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, timeout: 10, headers: headers}
-    execute(opts)
+  def feature_permissions(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}/feature-permissions", params: params, headers: headers)
   end
 
-  def feature_permissions(account_id, id)
-    url = build_url(account_id, id) + "/feature-permissions"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, timeout: 10, headers: headers}
-    execute(opts)
+  def permissions(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}/permissions", params: params, headers: headers)
   end
 
-  def permissions(account_id, id)
-    url = build_url(account_id, id) + "/permissions"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, timeout: 10, headers: headers}
-    execute(opts)
-  end
-
-  def available_roles(account_id, id=nil, options={})
-    url = build_url(account_id, id) + "/available-roles"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
-    opts = {method: :get, url: url, timeout: 10, headers: headers}
-    execute(opts)
-  end
-
-  def create(account_id, options)
-    url = build_url(account_id)
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
-    opts = {method: :post, url: url, timeout: 10, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def update(account_id, id, options)
-    url = build_url(account_id, id)
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
-    opts = {method: :put, url: url, timeout: 10, headers: headers, payload: payload.to_json}
-    execute(opts)
-  end
-
-  def destroy(account_id, id)
-    url = build_url(account_id, id)
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 10, headers: headers}
-    execute(opts)
+  def available_roles(id=nil, params={}, headers={})
+    execute(method: :get, url: "#{build_url(id)}/available-roles", params: params, headers: headers)
   end
 
   private
 
-  def build_url(account_id=nil, user_id=nil)
-    url = "#{@base_url}/api"
-    if account_id
-      url += "/accounts/#{account_id}/users"
-    else
-      url += "/users"
-    end
-    if user_id
-      url += "/#{user_id}"
+  def build_url(id=nil)
+    url = base_path
+    if id
+      url += "/#{id}"
     end
     url
   end