morpheus-cli 5.3.2.3 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fedf8a7443a29dd8ac5097e8f17bec94d481d3d1cadffd16dce033d9cb152f61
-  data.tar.gz: f1a306e2a42cebcb474371e589c07b2b31f6ed84faee0d47b640813e672d08ce
+  metadata.gz: 6cb700dea3828e709872e3cbdd2273b369aeee43bc7f451a305101ee3e0d7385
+  data.tar.gz: 19414673dc1b1631b4221f6c280228cbc14f49b2a4356bc45a3a98a67bdfa9a6
 SHA512:
-  metadata.gz: fe7834f3099b3dd5666c9230c8b833ac05a613d58465850d0eaf5e88cdb973a8eec4ac020946d6ba902abb43cd71d705760040e69b243a2e670e2dd8b5295c9b
-  data.tar.gz: 3cc4909d59ae2fcf99f319e74a13eb4db2261fe475629723b6a091fbf3dd13aa5f92e939ae9262ec44b9817b97591c21d6ac69046c400c41523ed588c9602087
+  metadata.gz: f1cc0cd19da8b84cff01f68e92ad8f82261bb399beff06b99461b4e9fc4fa76b5e1553e3f7a2aacf0dff746f858b9ef805f9d5a2c058da3af7d71fbd2bf616cc
+  data.tar.gz: dc86c29c0192b1b82b5f449f6c1803f7476164c4444f7ee285d3db5397d7778ae0e45438b14ca27feab8d14269222cc59a17dd7a329c6962aeb8bd8cf2bb6962

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.3.2.3
+RUN gem install morpheus-cli -v 5.4.1
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/account_users_interface.rb

@@ -0,0 +1,68 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::AccountUsersInterface < Morpheus::RestInterface
+
+  def base_path(account_id)
+    if account_id
+      "/api/accounts/#{account_id}/users"
+    else
+      "/api/users"
+    end
+  end
+
+  def list(account_id, params={}, headers={})
+    #validate_id!(account_id, "account_id")
+    execute(method: :get, url: "#{build_url(account_id)}", params: params, headers: headers)
+  end
+
+  def get(account_id, id, params={}, headers={})
+    #validate_id!(account_id, "account_id")
+    validate_id!(id)
+    execute(method: :get, url: "#{build_url(account_id, id)}", params: params, headers: headers)
+  end
+
+  def create(account_id, payload, params={}, headers={})
+    #validate_id!(account_id, "account_id")
+    execute(method: :post, url: "#{build_url(account_id)}", params: params, payload: payload, headers: headers)
+  end
+
+  def update(account_id, id, payload, params={}, headers={})
+    #validate_id!(account_id, "account_id")
+    validate_id!(id)
+    execute(method: :put, url: "#{build_url(account_id, id)}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy(account_id, id, params = {}, headers={})
+    #validate_id!(account_id, "account_id")
+    validate_id!(id)
+    execute(method: :delete, url: "#{build_url(account_id, id)}", params: params, headers: headers)
+  end
+
+  def feature_permissions(account_id, id, params={}, headers={})
+    #validate_id!(account_id, "account_id")
+    validate_id!(id)
+    execute(method: :get, url: "#{build_url(account_id, id)}/feature-permissions", params: params, headers: headers)
+  end
+
+  def permissions(account_id, id, params={}, headers={})
+    #validate_id!(account_id, "account_id")
+    validate_id!(id)
+    execute(method: :get, url: "#{build_url(account_id, id)}/permissions", params: params, headers: headers)
+  end
+
+  def available_roles(account_id, id=nil, params={}, headers={})
+    #validate_id!(account_id, "account_id")
+    execute(method: :get, url: "#{build_url(account_id, id)}/available-roles", params: params, headers: headers)
+  end
+
+  private
+
+  def build_url(account_id, id=nil)
+    url = base_path(account_id)
+    if id
+      url += "/#{CGI::escape(id.to_s)}"
+    end
+    url
+  end
+
+end

data/lib/morpheus/api/api_client.rb

@@ -1,7 +1,8 @@
 require 'json'
 require 'uri'
 require 'cgi'
-require 'rest-client'
+require 'morpheus/rest_client'
+# require 'rest-client'
 
 class Morpheus::APIClient
 
@@ -241,7 +242,7 @@ class Morpheus::APIClient
     # @verify_ssl is not used atm
     # todo: finish this and use it instead of the global variable RestClient.ssl_verification_enabled?
     # gotta clean up all APIClient subclasses new() methods to support this
-    # the CliCommand subclasses should be changed to @users_interface = @api_client.users
+    # the CliCommand subclasses should be changed to @foos_interface = @api_client.foos
     # also.. Credentials.new()
     if @verify_ssl == false
       opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
@@ -486,6 +487,14 @@ class Morpheus::APIClient
     Morpheus::LoadBalancerPoolsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def load_balancer_profiles
+    Morpheus::LoadBalancerProfilesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def load_balancer_monitors
+    Morpheus::LoadBalancerMonitorsInterface.new(common_interface_options).setopts(@options)
+  end
+
   def tasks
     Morpheus::TasksInterface.new(common_interface_options).setopts(@options)
   end
@@ -538,6 +547,10 @@ class Morpheus::APIClient
     Morpheus::UsersInterface.new(common_interface_options).setopts(@options)
   end
 
+  def account_users
+    Morpheus::AccountUsersInterface.new(common_interface_options).setopts(@options)
+  end
+
   def user_groups
     Morpheus::UserGroupsInterface.new(common_interface_options).setopts(@options)
   end
@@ -684,6 +697,22 @@ class Morpheus::APIClient
     Morpheus::StorageProvidersInterface.new(common_interface_options).setopts(@options)
   end
 
+  def storage_servers
+    Morpheus::StorageServersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def storage_server_types
+    Morpheus::StorageServerTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def storage_volumes
+    Morpheus::StorageVolumesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def storage_volume_types
+    Morpheus::StorageVolumeTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def library_instance_types
     Morpheus::LibraryInstanceTypesInterface.new(common_interface_options).setopts(@options)
   end
@@ -768,14 +797,18 @@ class Morpheus::APIClient
     Morpheus::WikiInterface.new(common_interface_options).setopts(@options)
   end
 
-  def budgets
-    Morpheus::BudgetsInterface.new(common_interface_options).setopts(@options)
-  end
-
   def health
     Morpheus::HealthInterface.new(common_interface_options).setopts(@options)
   end
 
+  def audit
+    Morpheus::AuditInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def budgets
+    Morpheus::BudgetsInterface.new(common_interface_options).setopts(@options)
+  end
+
   def invoices
     Morpheus::InvoicesInterface.new(common_interface_options).setopts(@options)
   end
@@ -836,12 +869,46 @@ class Morpheus::APIClient
     Morpheus::VdiGatewaysInterface.new(common_interface_options).setopts(@options)
   end
 
+  def network_servers
+    Morpheus::NetworkServersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def network_edge_clusters
+    Morpheus::NetworkEdgeClustersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def network_dhcp_servers
+    Morpheus::NetworkDhcpServersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def network_dhcp_relays
+    Morpheus::NetworkDhcpRelaysInterface.new(common_interface_options).setopts(@options)
+  end
+  
+  def network_static_routes
+    Morpheus::NetworkStaticRoutesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def rest(endpoint)
+    Morpheus::RestInterface.new(common_interface_options).setopts(@options.merge({base_path: "#{@base_url}/api/#{endpoint}"}))
+  end
+
+  def interface(type)
+    type = type.to_s.singularize.underscore
+    interface_name = type.pluralize
+    if !respond_to?(interface_name)
+      raise "#{self.class} has not defined an interface method named '#{interface_name}'"
+    end
+    return send(interface_name)
+  end
+  alias :get_interface :interface
+
   # add new interfaces here
 
   protected
 
-  def validate_id!(id)
-    raise "#{self.class} passed a blank id!" if id.to_s.strip.empty?
+  def validate_id!(id, param_name='id')
+    raise "#{self.class} passed a blank #{param_name}!" if id.to_s.strip.empty?
   end
 
 end

data/lib/morpheus/api/audit_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::AuditInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/audit"
+  end
+
+end

data/lib/morpheus/api/clouds_interface.rb

@@ -24,17 +24,10 @@ class Morpheus::CloudsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def get(params=nil)
-    url = "#{@base_url}/api/zones"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-
-    if params.is_a?(Hash)
-      headers[:params].merge!(params)
-    elsif params.is_a?(Numeric)
-      url = "#{@base_url}/api/zones/#{params}"
-    elsif params.is_a?(String)
-      headers[:params]['name'] = params
-    end
+  def get(id, params={})
+    validate_id!(id)
+    url = "#{@base_url}/api/zones/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end

data/lib/morpheus/api/health_interface.rb

@@ -49,6 +49,13 @@ class Morpheus::HealthInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def notifications(params={})
+    url = "#{@base_url}/api/health/notifications"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def logs(params={})
     url = "#{@base_url}/api/health/logs"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
@@ -56,11 +63,38 @@ class Morpheus::HealthInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def notifications(params={})
-    url = "#{@base_url}/api/health/notifications"
+  def export_logs(outfile, params={})
+    url = "#{@base_url}/api/health/logs/export"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+    # execute(opts, {parse_json: false})
+    if Dir.exists?(outfile)
+      raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
+    end
+    # if @verify_ssl == false
+    #   opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
+    # end
+    if @dry_run
+      return opts
+    end
+    http_response = nil
+    bad_body = nil
+    File.open(outfile, 'w') {|f|
+      block = proc { |response|
+        if response.code.to_i == 200
+          response.read_body do |chunk|
+              #puts "writing to #{outfile} ..."
+              f.write chunk
+          end
+        else
+          # puts_error (#{response.inspect}) #{chunk} ..."
+          bad_body = response.body.to_s
+        end
+      }
+      opts[:block_response] = block
+      http_response = Morpheus::RestClient.execute(opts)
+    }
+    return http_response, bad_body
   end
 
 end

data/lib/morpheus/api/instances_interface.rb

@@ -57,11 +57,24 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def cancel_removal(id, params = {})
-    url = "#{@base_url}/api/instances/#{id}/cancel-removal"
-    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers}
-    execute(opts)
+  def extend_shutdown(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/extend-shutdown", params: params, payload: payload, headers: headers)
+  end
+
+  def extend_expiration(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/extend-expiration", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_shutdown(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-shutdown", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_expiration(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-expiration", params: params, payload: payload, headers: headers)
+  end
+
+  def cancel_removal(id, params={}, payload={}, headers={})
+    execute(method: :put, url: "#{base_path}/#{id}/cancel-removal", params: params, payload: payload, headers: headers)
   end
 
   def stop(id, params={})
@@ -331,4 +344,25 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(method: :get, url: "/api/instances/#{id}/deploy", params: params)
   end
 
+  def refresh(id, params, payload)
+    url = "#{@base_url}/api/instances/#{id}/refresh"
+    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def apply(id, params, payload)
+    url = "#{@base_url}/api/instances/#{id}/apply"
+    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def state_summary(id, params={})
+    url = "#{@base_url}/api/instances/#{id}/state-summary"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
 end

data/lib/morpheus/api/load_balancer_monitors_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/secondary_rest_interface'
+
+class Morpheus::LoadBalancerMonitorsInterface < Morpheus::SecondaryRestInterface
+
+  def base_path(load_balancer_id)
+    "/api/load-balancers/#{load_balancer_id}/monitors"
+  end
+
+end

data/lib/morpheus/api/load_balancer_profiles_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/secondary_rest_interface'
+
+class Morpheus::LoadBalancerProfilesInterface < Morpheus::SecondaryRestInterface
+
+  def base_path(load_balancer_id)
+    "/api/load-balancers/#{load_balancer_id}/profiles"
+  end
+
+end

data/lib/morpheus/api/load_balancer_virtual_servers_interface.rb

@@ -6,4 +6,13 @@ class Morpheus::LoadBalancerVirtualServersInterface < Morpheus::SecondaryRestInt
     "/api/load-balancers/#{load_balancer_id}/virtual-servers"
   end
 
+  def list(parent_id=nil, params={}, headers={})
+    if parent_id
+      validate_id!(parent_id)
+      execute(method: :get, url: "#{base_path(parent_id)}", params: params, headers: headers)
+    else
+      execute(method: :get, url: "/api/load-balancer-virtual-servers", params: params, headers: headers)
+    end
+  end
+
 end

data/lib/morpheus/api/load_balancers_interface.rb

@@ -6,4 +6,9 @@ class Morpheus::LoadBalancersInterface < Morpheus::RestInterface
     "/api/load-balancers"
   end
 
+  def refresh(id, payload, params={}, headers={})
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{CGI::escape(id.to_s)}/refresh", params: params, payload: payload, headers: headers)
+  end
+
 end

data/lib/morpheus/api/network_dhcp_relays_interface.rb

@@ -0,0 +1,36 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkDhcpRelaysInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def get_dhcp_relay(server_id, dhcp_relay_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_relay_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-relays/#{dhcp_relay_id}", params: params, headers: headers)
+  end
+
+  def list_dhcp_relays(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-relays", params: params, headers: headers)
+  end
+
+  def create_dhcp_relay(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/dhcp-relays", params: params, payload: payload, headers: headers)
+  end
+
+  def update_dhcp_relay(server_id, dhcp_relay_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_relay_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/dhcp-relays/#{dhcp_relay_id}", params: params, payload: payload, headers: headers)
+  end
+
+  def delete_dhcp_relay(server_id, dhcp_relay_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_relay_id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/dhcp-relays/#{dhcp_relay_id}", params: params, headers: headers)
+  end
+end

data/lib/morpheus/api/network_dhcp_servers_interface.rb

@@ -0,0 +1,36 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkDhcpServersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def get_dhcp_server(server_id, dhcp_server_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-servers/#{dhcp_server_id}", params: params, headers: headers)
+  end
+
+  def list_dhcp_servers(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-servers", params: params, headers: headers)
+  end
+
+  def create_dhcp_server(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/dhcp-servers", params: params, payload: payload, headers: headers)
+  end
+
+  def update_dhcp_server(server_id, dhcp_server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_server_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/dhcp-servers/#{dhcp_server_id}", params: params, payload: payload, headers: headers)
+  end
+
+  def delete_dhcp_server(server_id, dhcp_server_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_server_id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/dhcp-servers/#{dhcp_server_id}", params: params, headers: headers)
+  end
+end

data/lib/morpheus/api/network_edge_clusters_interface.rb

@@ -0,0 +1,26 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkEdgeClustersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def list_edge_clusters(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/edge-clusters", params: params, headers: headers)
+  end
+
+  def get_edge_cluster(server_id, edge_cluster_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(edge_cluster_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/edge-clusters/#{edge_cluster_id}", params: params, headers: headers)
+  end
+
+  def update_edge_cluster(server_id, edge_cluster_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(edge_cluster_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/edge-clusters/#{edge_cluster_id}", params: params, payload: payload, headers: headers)
+  end
+
+end

data/lib/morpheus/api/network_routers_interface.rb

@@ -66,6 +66,15 @@ class Morpheus::NetworkRoutersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def get_firewall_rule_group(router_id, group_id, params={})
+    raise "#{self.class}.get() passed a blank router id!" if router_id.to_s == ''
+    raise "#{self.class}.get() passed a blank group id!" if group_id.to_s == ''
+    url = "#{@base_url}/api/networks/routers/#{router_id}/firewall-rule-groups/#{group_id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def create_firewall_rule_group(router_id, payload={})
     url = "#{@base_url}/api/networks/routers/#{router_id}/firewall-rule-groups"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -143,6 +152,27 @@ class Morpheus::NetworkRoutersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def create_bgp_neighbor(router_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/bgp-neighbors"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update_bgp_neighbor(router_id, nat_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/bgp-neighbors/#{nat_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy_bgp_neighbor(router_id, nat_id, payload={})
+    url = "#{@base_url}/api/networks/routers/#{router_id}/bgp-neighbors/#{nat_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def update_permissions(router_id, payload)
     url = "#{@base_url}/api/networks/routers/#{router_id}/permissions"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/network_servers_interface.rb

@@ -0,0 +1,98 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkServersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def list_scopes(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/scopes", params: params, headers: headers)
+  end
+
+  def get_scope(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    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={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/scopes", params: params, payload: payload, headers: headers)
+  end
+
+  def update_scope(server_id, id, payload, params={}, headers={})
+    validate_id!(server_id)
+    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, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/scopes/#{id}", params: params, headers: headers)
+  end
+
+  def update_scope_permissions(server_id, id, payload, params={}, headers={})
+    validate_id!(server_id)
+    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