Move the samples/object_store directory to samples/objectstore so integration tests run.

Tests were expecting the directory to be samples/objectstore - I *think* because they take the service name, ("ObjectStore"), and lower-case it.

Author: jbeales

doc/services/object-store/v1/account.rst

@@ -6,13 +6,13 @@ Show account details
 
 To work with an Object Store account, you must first retrieve an account object like so:
 
-.. sample:: object_store/v1/account/get.php
+.. sample:: objectstore/v1/account/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getAccount
 
 Get account metadata
 --------------------
 
-.. sample:: object_store/v1/account/get_metadata.php
+.. sample:: objectstore/v1/account/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_getMetadata
 
 Replace all metadata with new values
@@ -43,7 +43,7 @@ the metadata of the account will now be:
 
 To merge metadata, you must run:
 
-.. sample:: object_store/v1/account/reset_metadata.php
+.. sample:: objectstore/v1/account/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_resetMetadata
 
 Merge new metadata values with existing
@@ -75,5 +75,5 @@ the metadata of the account will now be:
 
 To reset metadata, you must run:
 
-.. sample:: object_store/v1/account/merge_metadata.php
+.. sample:: objectstore/v1/account/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Account.html#method_mergeMetadata

doc/services/object-store/v1/containers.rst

@@ -4,7 +4,7 @@ Containers
 Show details for a container
 ----------------------------
 
-.. sample:: object_store/v1/containers/get.php
+.. sample:: objectstore/v1/containers/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_getContainer
 
 At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the
@@ -25,7 +25,7 @@ and all of the local properties will match those of the remote resource.
 List containers
 ---------------
 
-.. sample:: object_store/v1/containers/list.php
+.. sample:: objectstore/v1/containers/list.php
 .. refdoc:: OpenStack/ObjectStore/v1/Service.html#method_listContainers
 
 When listing containers, you must be aware that not *all* information about a container is returned in a collection.
@@ -46,7 +46,7 @@ container.
 Delete container
 ----------------
 
-.. sample:: object_store/v1/containers/delete.php
+.. sample:: objectstore/v1/containers/delete.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_delete
 
 The API will only accept DELETE requests on containers when they are empty. If you have a container with any objects
@@ -55,7 +55,7 @@ inside, the operation will fail.
 Get metadata
 ------------
 
-.. sample:: object_store/v1/containers/get_metadata.php
+.. sample:: objectstore/v1/containers/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
@@ -65,7 +65,7 @@ correspond to the values set either when the container was created, or when a pr
 Replace all metadata with new values
 ------------------------------------
 
-.. sample:: object_store/v1/containers/reset_metadata.php
+.. sample:: objectstore/v1/containers/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_resetMetadata
 
 In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata
@@ -95,7 +95,7 @@ the metadata of the account will now be:
 Merge new metadata values with existing
 ---------------------------------------
 
-.. sample:: object_store/v1/containers/merge_metadata.php
+.. sample:: objectstore/v1/containers/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_mergeMetadata
 
 In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing

doc/services/object-store/v1/objects.rst

@@ -4,7 +4,7 @@ Objects
 Show details for an object
 --------------------------
 
-.. sample:: object_store/v1/objects/get.php
+.. sample:: objectstore/v1/objects/get.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_getObject
 
 At this point, the object returned is *empty* because we did not execute a HTTP request to receive the state of the
@@ -26,7 +26,7 @@ of the object's metadata, will not download the object's content. To do this, se
 Download an object
 ------------------
 
-.. sample:: object_store/v1/objects/download.php
+.. sample:: objectstore/v1/objects/download.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_download
 
 As you will notice, a Stream_ object is returned by this call. For more information about dealing with streams, please
@@ -38,7 +38,7 @@ consult `Guzzle's docs`_.
 List objects
 ------------
 
-.. sample:: object_store/v1/objects/list.php
+.. sample:: objectstore/v1/objects/list.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_listObjects
 
 When listing objects, you must be aware that not *all* information about a container is returned in a collection.
@@ -61,13 +61,13 @@ Create an object
 
 When creating an object, you can upload its content according to a string representation:
 
-.. sample:: object_store/v1/objects/create.php
+.. sample:: objectstore/v1/objects/create.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createObject
 
 If that is not optimal or convenient, you can use a stream instead. Any instance of ``\Psr\Http\Message\StreamInterface``
 is acceptable. For example, to use a normal Guzzle stream:
 
-.. sample:: object_store/v1/objects/create_from_stream.php
+.. sample:: objectstore/v1/objects/create_from_stream.php
 
 Create a large object (over 5GB)
 --------------------------------
@@ -81,25 +81,25 @@ uploading, this is what happens under the hood:
 
 To upload a DLO, you need to call:
 
-.. sample:: object_store/v1/objects/create_large_object.php
+.. sample:: objectstore/v1/objects/create_large_object.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/Container.html#method_createLargeObject
 
 Copy object
 -----------
 
-.. sample:: object_store/v1/objects/copy.php
+.. sample:: objectstore/v1/objects/copy.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_copy
 
 Delete object
 -------------
 
-.. sample:: object_store/v1/objects/delete.php
+.. sample:: objectstore/v1/objects/delete.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_delete
 
 Get metadata
 ------------
 
-.. sample:: object_store/v1/objects/get_metadata.php
+.. sample:: objectstore/v1/objects/get_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_getMetadata
 
 The returned value will be a standard associative array, or hash, containing arbitrary key/value pairs. These will
@@ -109,7 +109,7 @@ correspond to the values set either when the object was created, or when a previ
 Replace all metadata with new values
 ------------------------------------
 
-.. sample:: object_store/v1/objects/reset_metadata.php
+.. sample:: objectstore/v1/objects/reset_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_resetMetadata
 
 In order to replace all existing metadata with a set of new values, you can use this operation. Any existing metadata
@@ -139,7 +139,7 @@ the metadata of the account will now be:
 Merge new metadata values with existing
 ---------------------------------------
 
-.. sample:: object_store/v1/objects/merge_metadata.php
+.. sample:: objectstore/v1/objects/merge_metadata.php
 .. refdoc:: OpenStack/ObjectStore/v1/Models/StorageObject.html#method_mergeMetadata
 
 In order to merge a set of new metadata values with the existing metadata set, you can use this operation. Any existing