oneview-sdk 1.0.0 → 2.0.0

data/lib/oneview-sdk/resource/storage_pool.rb

@@ -1,41 +1,63 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
 module OneviewSDK
   # Storage pool resource implementation
   class StoragePool < Resource
     BASE_URI = '/rest/storage-pools'.freeze
 
+    # Add the resource on OneView using the current data
+    # @note Calls the refresh method to set additional data
+    # @raise [OneviewSDK::IncompleteResource] if the client is not set
+    # @raise [StandardError] if the resource creation fails
+    # @return [OneviewSDK::StoragePool] self
+    alias add create
+
+    # Remove resource from OneView
+    # @return [true] if resource was removed successfully
+    alias remove delete
+
+    # Create a resource object, associate it with a client, and set its properties.
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
+    # @param [Hash] params The options for this resource (key-value pairs)
+    # @param [Integer] api_ver The api version to use when interracting with this resource.
     def initialize(client, params = {}, api_ver = nil)
       super
       # Default values:
       @data['type'] ||= 'StoragePoolV2'
     end
 
-    # @!group Validates
-
-    VALID_REFRESH_STATES = %w(NotRefreshing RefreshFailed RefreshPending Refreshing).freeze
-    # Validate refreshState
-    # @param [String] value NotRefreshing, RefreshFailed, RefreshPending, Refreshing
-    def validate_refreshState(value)
-      fail 'Invalid refresh state' unless VALID_REFRESH_STATES.include?(value)
-    end
-
-    VALID_STATUSES = %w(OK Disabled Warning Critical Unknown).freeze
-    # Validate status
-    # @param [String] value OK, Disabled, Warning, Critical, Unknown
-    def validate_status(value)
-      fail 'Invalid status' unless VALID_STATUSES.include?(value)
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def create
+      unavailable_method
     end
 
-    # @!endgroup
-
-    # Set storage system
-    # @param [StorageSystem] storage_system
-    def set_storage_system(storage_system)
-      set('storageSystemUri', storage_system['uri'])
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def delete
+      unavailable_method
     end
 
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
     def update
       unavailable_method
     end
 
+    # Sets the storage system
+    # @param [OneviewSDK::StorageSystem] storage_system
+    def set_storage_system(storage_system)
+      fail IncompleteResource, 'Please set the storage system\'s uri attribute!' unless storage_system['uri']
+      set('storageSystemUri', storage_system['uri'])
+    end
   end
 end

data/lib/oneview-sdk/resource/storage_system.rb

@@ -1,15 +1,49 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
 module OneviewSDK
   # Storage system resource implementation
   class StorageSystem < Resource
     BASE_URI = '/rest/storage-systems'.freeze
 
+    # Remove resource from OneView
+    # @return [true] if resource was removed successfully
+    alias remove delete
+
+    # Create a resource object, associate it with a client, and set its properties.
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
+    # @param [Hash] params The options for this resource (key-value pairs)
+    # @param [Integer] api_ver The api version to use when interracting with this resource.
     def initialize(client, params = {}, api_ver = nil)
       super
       # Default values:
       @data['type'] ||= 'StorageSystemV3'
     end
 
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
     def create
+      unavailable_method
+    end
+
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def delete
+      unavailable_method
+    end
+
+    # Adds the resource to OneView using the current data
+    # @note Calls the refresh method to set additional data
+    # @return [OneviewSDK::StorageSystem] self
+    def add
       ensure_client
       task = @client.rest_post(self.class::BASE_URI, { 'body' => self['credentials'] }, @api_version)
       temp = @data.clone
@@ -21,33 +55,50 @@ module OneviewSDK
       self
     end
 
-    def retrieve!
-      if @data['name']
-        super
-      else
-        ip_hostname = self['credentials'][:ip_hostname] || self['credentials']['ip_hostname']
-        results = self.class.find_by(@client, credentials: { ip_hostname: ip_hostname })
-        return false unless results.size == 1
-        set_all(results[0].data)
-        true
+    # Checks if the resource already exists
+    # @note name,uri or ip_hostname must be specified inside resource
+    # @return [Boolean] Whether or not resource exists
+    def exists?
+      ip_hostname = self['credentials'][:ip_hostname] || self['credentials']['ip_hostname'] if self['credentials']
+      return true if @data['name'] && self.class.find_by(@client, name: @data['name']).size == 1
+      return true if @data['uri']  && self.class.find_by(@client, uri:  @data['uri']).size == 1
+      return true if ip_hostname && self.class.find_by(@client, credentials: { ip_hostname: ip_hostname }).size == 1
+      unless @data['name'] || @data['uri'] || ip_hostname
+        fail IncompleteResource, 'Must set resource name, uri or ip_hostname before trying to retrieve!'
       end
+      false
+    end
+
+    # Retrieves the resource details based on this resource's name or URI.
+    # @note Name,URI or ip_hostname must be specified inside resource
+    # @return [Boolean] Whether or not retrieve was successful
+    # @raise [OneviewSDK::IncompleteResource] if attributes are not filled
+    def retrieve!
+      ip_hostname = self['credentials'][:ip_hostname] || self['credentials']['ip_hostname'] if self['credentials']
+      return super if @data['name'] || @data['uri']
+
+      fail IncompleteResource, 'Must set resource name, uri or ip_hostname before trying to retrieve!' unless ip_hostname
+      results = self.class.find_by(@client, credentials: { ip_hostname: ip_hostname })
+      return false unless results.size == 1
+      set_all(results[0].data)
+      true
     end
 
-    # Get host types for storage system resource
-    # @param [Client] client client handle REST calls to OV instance
+    # Gets the host types for the storage system resource
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
     # @return [String] response body
     def self.get_host_types(client)
       response = client.rest_get(BASE_URI + '/host-types')
       response.body
     end
 
-    # List of storage pools
+    # Lists the storage pools
     def get_storage_pools
       response = @client.rest_get(@data['uri'] + '/storage-pools')
       response.body
     end
 
-    # List of all managed target ports for the specified storage system
+    # Lists all managed target ports for the specified storage system,
     # or only the one specified
     # @param [String] port Target port
     def get_managed_ports(port = nil)
@@ -58,6 +109,5 @@ module OneviewSDK
                  end
       response.body
     end
-
   end
 end

data/lib/oneview-sdk/resource/switch.rb

@@ -0,0 +1,86 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module OneviewSDK
+  # Switch resource implementation
+  class Switch < Resource
+    BASE_URI = '/rest/switches'.freeze
+    TYPE_URI = '/rest/switch-types'.freeze
+
+    # Remove resource from OneView
+    # @return [true] if resource was removed successfully
+    alias remove delete
+
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def create
+      unavailable_method
+    end
+
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def update
+      unavailable_method
+    end
+
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def refresh
+      unavailable_method
+    end
+
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def delete
+      unavailable_method
+    end
+
+    # Retrieves the switch types
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
+    # @return [Array] All the Switch types
+    def self.get_types(client)
+      response = client.rest_get(TYPE_URI)
+      response = client.response_handler(response)
+      response['members']
+    end
+
+    # Retrieves the switch type with the name
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
+    # @param [String] name Switch type name
+    # @return [Array] Switch type
+    def self.get_type(client, name)
+      results = get_types(client)
+      results.find { |switch_type| switch_type['name'] == name }
+    end
+
+    # Get statistics for an interconnect, for the specified port or subport
+    # @param [String] port_name port to retrieve statistics
+    # @param [String] subport_number subport to retrieve statistics
+    # @return [Hash] Switch statistics
+    def statistics(port_name = nil, subport_number = nil)
+      uri = if subport_number
+              "#{@data['uri']}/statistics/#{port_name}/subport/#{subport_number}"
+            else
+              "#{@data['uri']}/statistics/#{port_name}"
+            end
+      response = @client.rest_get(uri)
+      response.body
+    end
+
+    # Get settings that describe the environmental configuration
+    # @return [Hash] Configuration parameters
+    def environmental_configuration
+      ensure_client && ensure_uri
+      response = @client.rest_get(@data['uri'] + '/environmentalConfiguration', @api_version)
+      @client.response_handler(response)
+    end
+  end
+end

data/lib/oneview-sdk/resource/unmanaged_device.rb

@@ -0,0 +1,55 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module OneviewSDK
+  # Storage system resource implementation
+  class UnmanagedDevice < Resource
+    BASE_URI = '/rest/unmanaged-devices'.freeze
+
+    # Add the resource on OneView using the current data
+    # @note Calls the refresh method to set additional data
+    # @raise [OneviewSDK::IncompleteResource] if the client is not set
+    # @raise [StandardError] if the resource creation fails
+    # @return [OneviewSDK::UnmanagedDevice] self
+    alias add create
+
+    # Remove resource from OneView
+    # @return [true] if resource was removed successfully
+    alias remove delete
+
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def create
+      unavailable_method
+    end
+
+    # Method is not available
+    # @raise [OneviewSDK::MethodUnavailable] method is not available
+    def delete
+      unavailable_method
+    end
+
+    # Gets a list of unmanaged devices
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
+    # @return [Array] list of unmanaged devices
+    def self.get_devices(client)
+      response = client.rest_get(BASE_URI)
+      client.response_handler(response)['members']
+    end
+
+    # Get settings that describe the environmental configuration
+    def environmental_configuration
+      ensure_client && ensure_uri
+      response = @client.rest_get(@data['uri'] + '/environmentalConfiguration')
+      @client.response_handler(response)
+    end
+  end
+end

data/lib/oneview-sdk/resource/uplink_set.rb

@@ -1,8 +1,23 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
 module OneviewSDK
   # Uplink set resource implementation
   class UplinkSet < Resource
     BASE_URI = '/rest/uplink-sets'.freeze
 
+    # Create a resource object, associate it with a client, and set its properties.
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
+    # @param [Hash] params The options for this resource (key-value pairs)
+    # @param [Integer] api_ver The api version to use when interracting with this resource.
     def initialize(client, params = {}, api_ver = nil)
       super
       # Default values
@@ -14,61 +29,7 @@ module OneviewSDK
       @data['type'] ||= 'uplink-setV3'
     end
 
-    # @!group Validates
-
-    VALID_ETHERNET_NETWORK_TYPES = %w(NotApplicable Tagged Tunnel Unknown Untagged).freeze
-    # Validate ethernetNetworkType
-    # @param [String] value NotApplicable, Tagged, Tunnel, Unknown, Untagged
-    def validate_ethernetNetworkType(value)
-      fail 'Invalid ethernet network type' unless VALID_ETHERNET_NETWORK_TYPES.include?(value)
-    end
-
-    VALID_LACP_TIMERS = %w(Short Long).freeze
-    # Validate lacpTimer
-    # @param [String] value Short, Long
-    def validate_lacpTimer(value)
-      return if value.to_s.empty?
-      fail 'Invalid lacp timer' unless %w(Short Long).include?(value)
-    end
-
-    VALID_MANUAL_LOGIN_REDISTRIBUTION_STATES = %w(Distributed Distributing DistributionFailed NotSupported Supported).freeze
-    # Validate manualLoginRedistributionState
-    # @param [String] value Distributed, Distributing, DistributionFailed, NotSupported, Supported
-    def validate_manualLoginRedistributionState(value)
-      fail 'Invalid manual login redistribution state' unless VALID_MANUAL_LOGIN_REDISTRIBUTION_STATES.include?(value)
-    end
-
-    VALID_NETWORK_TYPES = %w(Ethernet FibreChannel).freeze
-    # Validate networkType
-    # @param [String] value Ethernet, FibreChannel
-    def validate_networkType(value)
-      fail 'Invalid network type' unless VALID_NETWORK_TYPES.include?(value)
-    end
-
-    VALID_LOCATION_ENTRIES_TYPES = %w(Bay Enclosure Ip Password Port StackingDomainId StackingMemberId UserId).freeze
-    # Validate locationEntriesType
-    # @param [String] value Bay Enclosure Ip Password Port StackingDomainId StackingMemberId UserId
-    def validate_locationEntriesType(value)
-      fail 'Invalid location entry type' unless VALID_LOCATION_ENTRIES_TYPES.include?(value)
-    end
-
-    VALID_REACHABILITIES = ['NotReachable', 'Reachable', 'RedundantlyReachable', 'Unknown', nil].freeze
-    # Validate ethernetNetworkType request
-    # @param [String] value NotReachable Reachable RedundantlyReachable Unknown
-    def validate_reachability(value)
-      fail 'Invalid reachability' unless VALID_REACHABILITIES.include?(value)
-    end
-
-    VALID_STATUSES = %w(OK Disabled Warning Critical Unknown).freeze
-    # Validate ethernetNetworkType request
-    # @param [String] value OK Disabled Warning Critical Unknown
-    def validate_status(value)
-      fail 'Invalid status' unless VALID_STATUSES.include?(value)
-    end
-
-    # @!endgroup
-
-    # Add portConfigInfos to the array
+    # Adds the portConfigInfos to the array
     # @param [String] portUri
     # @param [String] speed
     # @param [Hash] locationEntries
@@ -83,37 +44,36 @@ module OneviewSDK
       @data['portConfigInfos'] << entry
     end
 
-    # Set logical interconnect uri
+    # Sets the logical interconnect uri
     # @param [OneviewSDK::LogicalInterconnect, Hash] logical_interconnect
     def set_logical_interconnect(logical_interconnect)
       uri = logical_interconnect[:uri] || logical_interconnect['uri']
-      fail 'Invalid object' unless uri
+      fail IncompleteResource, 'Invalid object' unless uri
       @data['logicalInterconnectUri'] = uri
     end
 
-    # Add an uri to networkUris array
+    # Adds an ethernet network to the uplink set
     # @param [OneviewSDK::EthernetNetwork, Hash] network
     def add_network(network)
       uri = network[:uri] || network['uri']
-      fail 'Invalid object' unless uri
+      fail IncompleteResource, 'Must set network uri attribute' unless uri
       @data['networkUris'].push(uri)
     end
 
-    # Add an uri to fcnetworkUris array
+    # Adds an fc network to the uplink set
     # @param [OneviewSDK::FCNetwork, Hash] network must accept hash syntax
     def add_fcnetwork(network)
       uri = network[:uri] || network['uri']
-      fail 'Invalid object' unless uri
+      fail IncompleteResource, 'Must set network uri attribute' unless uri
       @data['fcNetworkUris'].push(uri)
     end
 
-    # Add an uri to fcoenetworkUris array
+    # Adds an fcoe network to the uplink set
     # @param [OneviewSDK::FCoENetwork, Hash] network must accept hash syntax
     def add_fcoenetwork(network)
       uri = network[:uri] || network['uri']
-      fail 'Invalid object' unless uri
+      fail IncompleteResource, 'Must set network uri attribute' unless uri
       @data['fcoeNetworkUris'].push(uri)
     end
-
   end
 end

data/lib/oneview-sdk/resource/volume.rb

@@ -1,19 +1,19 @@
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# You may not use this file except in compliance with the License.
+# You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
 module OneviewSDK
   # Volume resource implementation
   class Volume < Resource
     BASE_URI = '/rest/storage-volumes'.freeze
 
-    # @!group Validates
-
-    VALID_PROVISION_TYPES = %w(Thin Full).freeze
-    # Validate the type of provisioning
-    # @param [String] value Must be Thin or Full
-    def validate_provisionType(value)
-      fail 'Invalid provision type' unless VALID_PROVISION_TYPES.include?(value)
-    end
-
-    # @!endgroup
-
     # It's possible to create the volume in 6 different ways:
     # 1) Common = Storage System + Storage Pool
     # 2) Template = Storage Volume Template
@@ -22,10 +22,10 @@ module OneviewSDK
     # 5) Management by name = Storage System + Storage System Volume Name
     # 6) Snapshot = Snapshot Pool + Storage Pool + Snapshot
 
-    # Create the volume
-    # @note provisioningParameters are required for creation, but not afterwards; after creation, they will be removed.
-    # @raise [RuntimeError] if the client is not set
-    # @raise [RuntimeError] if the resource creation fails
+    # Creates the volume
+    # @note provisioning parameters are required for creation, but not afterwards; after creation, they will be removed.
+    # @raise [OneviewSDK::IncompleteResource] if the client is not set
+    # @raise [StandardError] if the resource creation fails
     # @return [Resource] self
     def create
       ensure_client
@@ -36,7 +36,7 @@ module OneviewSDK
       self
     end
 
-    # Delete resource from OneView or from Oneview and storage system
+    # Deletes the resource from OneView or from Oneview and storage system
     # @param [Symbol] flag Delete storage system from Oneview only or in storage system as well
     # @return [true] if resource was deleted successfully
     def delete(flag = :all)
@@ -49,7 +49,7 @@ module OneviewSDK
         response = @client.rest_api(:delete, @data['uri'], {}, @api_version)
         @client.response_handler(response)
       else
-        fail 'Invalid flag value, use :oneview or :all'
+        fail InvalidResource, 'Invalid flag value, use :oneview or :all'
       end
       true
     end
@@ -65,10 +65,11 @@ module OneviewSDK
     # @param [OneviewSDK::StoragePool] storage_pool Storage pool
     def set_storage_pool(storage_pool)
       assure_uri(storage_pool)
-      set('storagePoolUri', storage_pool['uri'])
+      self['provisioningParameters'] ||= {}
+      self['provisioningParameters']['storagePoolUri'] = storage_pool['uri']
     end
 
-    # Adds storage volume template to the volume
+    # Adds the storage volume template to the volume
     # @param [OneviewSDK::VolumeTemplate] storage_volume_template Storage Volume Template
     def set_storage_volume_template(storage_volume_template)
       assure_uri(storage_volume_template)
@@ -82,7 +83,7 @@ module OneviewSDK
       set('snapshotPoolUri', storage_pool['uri'])
     end
 
-    # Create a snapshot of the volume
+    # Creates a snapshot of the volume
     # @param [String, OneviewSDK::VolumeSnapshot] snapshot String or OneviewSDK::VolumeSnapshot object
     # @param [String] description Provide a description
     # @return [true] if snapshot was created successfully
@@ -104,7 +105,7 @@ module OneviewSDK
       true
     end
 
-    # Delete a snapshot of the volume
+    # Deletes a snapshot of the volume
     # @param [String] name snapshot name
     # @return [true] if snapshot was created successfully
     def delete_snapshot(name)
@@ -114,7 +115,7 @@ module OneviewSDK
       true
     end
 
-    # Retrieve snapshot by name
+    # Retrieves a snapshot by name
     # @param [String] name
     # @return [Hash] snapshot data
     def get_snapshot(name)
@@ -124,7 +125,7 @@ module OneviewSDK
       end
     end
 
-    # Get snapshots of this volume
+    # Gets all the snapshots of this volume
     # @return [Array] Array of snapshots
     def get_snapshots
       ensure_uri && ensure_client
@@ -143,8 +144,8 @@ module OneviewSDK
       results
     end
 
-    # Get all the attachable volumes managed by the appliance
-    # @param [Client] client The client object for the appliance
+    # Gets all the attachable volumes managed by the appliance
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
     # @return [Array<OneviewSDK::Volume>] Array of volumes
     def self.get_attachable_volumes(client)
       results = []
@@ -161,14 +162,14 @@ module OneviewSDK
     end
 
     # Gets the list of extra managed storage volume paths
-    # @param [OneviewSDK::Client] client
+    # @param [OneviewSDK::Client] client The client object for the OneView appliance
     # @return response
     def self.get_extra_managed_volume_paths(client)
       response = client.rest_get(BASE_URI + '/repair?alertFixType=ExtraManagedStorageVolumePaths')
       client.response_handler(response)
     end
 
-    # Removes extra presentation from volume
+    # Removes extra presentation from the volume
     # @return response
     def repair
       response = client.rest_post(BASE_URI + '/repair', 'body' => { resourceUri: @data['uri'], type: 'ExtraManagedStorageVolumePaths' })
@@ -181,8 +182,7 @@ module OneviewSDK
     # If not, first it tries to retrieve, and then verify for its existence
     def assure_uri(resource)
       resource.retrieve! unless resource['uri']
-      fail "#{resource.class}: #{resource['name']} not found" unless resource['uri']
+      fail IncompleteResource, "#{resource.class}: #{resource['name']} not found" unless resource['uri']
     end
-
   end
 end