Changed language to converge with other documents, add some spaces for readability

I did a find an replace on all the word change and just added a space, so no contnet has changed but that one line in all files.

Remvoed the extra T from The.

Change-Id: Ie4c28d71fe51035207df08561e6c50a45dac9a87
This commit is contained in:
peterhowells 2015-03-19 19:14:22 -04:00
parent 2bdd647e88
commit 814693b885
6 changed files with 65 additions and 22 deletions

View File

@ -1,5 +1,5 @@
"""
Copyright 2013 Rackspace
Copyright 2015 Rackspace
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

View File

@ -26,9 +26,9 @@ class ServerListTest(ComputeFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the necessary resources for testing
Perform actions that setup the necessary resources for testing.
The following resources are created/defined during the setup
The following resources are created during the setup
- Networking, default network from ComputeFixture
- 2 servers with the same configuration (waits for active)
- Image creation from first server (waits for active)
@ -86,6 +86,7 @@ class ServerListTest(ComputeFixture):
It will take the first server created in setup and pulls the server
details back; nothing is modified during this test.
The following assertions occur:
- 200 status code from http call.
- Server name matches config.
@ -105,10 +106,11 @@ class ServerListTest(ComputeFixture):
@tags(type='smoke', net='no')
def test_list_servers(self):
"""
All 3 servers created in setup should be returned
All 3 servers created in setup should be returned.
The assertions are on that the min_details on all three servers are in the returned list
from the list_servers call.
The following assertions occur:
- 200 status code from http call.
- Server 1,2 and 3 are in the list returned in the response.
"""
list_servers_response = self.servers_client.list_servers()
servers_list = list_servers_response.entity
@ -120,11 +122,12 @@ class ServerListTest(ComputeFixture):
@tags(type='smoke', net='no')
def test_list_servers_with_detail(self):
"""
Details list of servers and verify they are in the list returned
Details list of servers and verify they are in the list returned.
After the list_servers_with_details is called, it grabs the entity,
then iterates through the details and puts all the server ids into an
array which then will look for the server ids in the list.
The following assertions occur:
- 200 status code from the http call.
- Server 1 id is contained in the list.
@ -144,13 +147,14 @@ class ServerListTest(ComputeFixture):
@tags(type='positive', net='no')
def test_list_server_details_using_marker(self):
"""
The list of servers should start from the provided marker (server id)
The list of servers should start from the provided marker (server id).
This gets all servers current in then compute instance with the call
list_serveris_with_details. Grabs the first item in the list, takes
the id and then calls the same list server with details with
parameters being the id of the first server it just returned to
ensure that the same server is not returned.
The following assertions occur:
- 200 status code from the http call.
- The first server returned is not in the new list of entities.
@ -169,13 +173,14 @@ class ServerListTest(ComputeFixture):
@tags(type='positive', net='no')
def test_list_servers_using_marker(self):
"""
The list of servers should start from the provided marker (server id)
The list of servers should start from the provided marker (server id).
This gets all servers current in then compute instance with the call
list_servers. Grabs the first item in the list, takes the id and then
calls the same list server with details with parameters being the id
of the first server it just returned to ensure that the same server
is not returned.
The following assertions occur:
- 200 status code from the http call.
- The first server returned is not in the new list of entities.
@ -199,6 +204,7 @@ class ServerListTest(ComputeFixture):
This will call the list_servers_with_detail with a parameter of an
1 (integer) being passed into the limit param. This should return
only 1 entry in the list.
The following assertions occur:
- The len of the list returned is equal to the limit (1).
"""
@ -214,10 +220,11 @@ class ServerListTest(ComputeFixture):
@tags(type='positive', net='no')
def test_list_servers_filter_by_image(self):
"""
Filter the list of servers by image that created the first 2 servers
Filter the list of servers by image that created the first 2 servers.
This will call the list_servers with the image which is the primary
image in the setup.
The following assertions occur:
- 200 status code from the http call.
- Server 1 and 2 are in the list.
@ -235,10 +242,11 @@ class ServerListTest(ComputeFixture):
@tags(type='positive', net='no')
def test_list_servers_filter_by_flavor(self):
"""
Filter the list of servers by flavor that created the 3rd server
Filter the list of servers by flavor that created the 3rd server.
This will call the list_servers with the alternate flavor that created
the third server.
The following assertions occur:
- 200 status code from the http call.
- Server 1 and 2 are not in the list.
@ -256,10 +264,11 @@ class ServerListTest(ComputeFixture):
@tags(type='positive', net='no')
def test_list_servers_filter_by_server_name(self):
"""
Filter the list of servers by name, using server 1's name
Filter the list of servers by name, using server 1's name.
This will call the list_servers with the server name that was created
at startup.
The following assertions occur:
- 200 status code from the http call.
- Server 1 is in the list.
@ -276,10 +285,11 @@ class ServerListTest(ComputeFixture):
@tags(type='positive', net='no')
def test_list_servers_filter_by_server_status(self):
"""
Filter the list of servers by server status of active
Filter the list of servers by server status of active.
This will call the list_servers with the status of active expecting
all servers to be returned.
The following assertions occur:
- 200 status code from the http call.
- Server 1, 2 and 3 are in the list.
@ -300,6 +310,7 @@ class ServerListTest(ComputeFixture):
This will call the list_servers with the expectation of all servers
being returned in the list. The list will be of all servers but will
go through then entries and pull the id into a list to compare against.
The following assertions occur:
- 200 status code from the http call.
- Server 1, 2 and 3's ids are in the generated list.
@ -322,6 +333,7 @@ class ServerListTest(ComputeFixture):
This will call the list_servers_with_detail with the image which is
the primary image in the setup.
The following assertions occur:
- 200 status code from the http call.
- Server 1 and 2 are in the list.
@ -345,6 +357,7 @@ class ServerListTest(ComputeFixture):
This will call the list_servers_with_detail with the alternate flavor
that created the third server.
The following assertions occur:
- 200 status code from the http call.
- Server 1 and 2 are not in the list.
@ -367,6 +380,7 @@ class ServerListTest(ComputeFixture):
This will call the list_servers_with_details with the server name that
was created at startup.
The following assertions occur:
- 200 status code from the http call.
- Server 1 is in the list.
@ -385,10 +399,11 @@ class ServerListTest(ComputeFixture):
@tags(type='positive', net='no')
def test_list_servers_detailed_filter_by_server_status(self):
"""
Filter the list of servers with details by server status of active
Filter the list of servers with details by server status of active.
This will call the list_servers_with_detail with the status of active
expecting all servers to be returned.
The following assertions occur:
- 200 status code from the http call.
- Server 1, 2 and 3 are in the list.
@ -414,6 +429,7 @@ class ServerListTest(ComputeFixture):
all servers being returned in the list. The list will be of all
servers but will go through the entries and pull the id into a list
to compare against.
The following assertions occur:
- 200 status code from the http call.
- Server 1, 2 and 3's ids are in the generated list.

View File

@ -24,9 +24,9 @@ class ServerMissingParameterTests(ComputeFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the necessary resources for testing
Perform actions that setup the necessary resources for testing.
The following resources are created/defined during the setup:
The following resources are created during the setup:
- Uses server behaviors to create active server.
- Adds server id to resources with the function to delete_server.
"""
@ -42,6 +42,7 @@ class ServerMissingParameterTests(ComputeFixture):
This will call the create_server through the cloudcafe's server client
without a name parameter.
The following assertions occur:
- Expecting the BadRequest Exception to be raised.
"""
@ -56,6 +57,7 @@ class ServerMissingParameterTests(ComputeFixture):
This will call the create_server through the cloudcafe's server client
without a image parameter.
The following assertions occur:
- Expecting the BadRequest Exception to be raised.
"""
@ -69,6 +71,7 @@ class ServerMissingParameterTests(ComputeFixture):
This will call the create_server through the cloudcafe's server client
without a flavor parameter.
The following assertions occur:
- Expecting the BadRequest Exception to be raised
"""
@ -82,6 +85,7 @@ class ServerMissingParameterTests(ComputeFixture):
This will call the create_server through the cloudcafe's server client
without a password parameter.
The following assertions occur:
- Expecting the BadRequest Exception to be raised.
"""
@ -96,7 +100,9 @@ class ServerMissingParameterTests(ComputeFixture):
This will call the reboot through cloudcafe's server client
without a reboot type. This will expect a BadRequest or ComputeFault
or set fail with an exception message.
No assertions are invoked
The following assertions occur:
- Expecting the BadRequest Exception to be raised and caught.
"""
try:
self.servers_client.reboot(self.server.id, None)
@ -115,6 +121,7 @@ class ServerMissingParameterTests(ComputeFixture):
This will call the rebuild through cloudcafe's server client
without a name and expect a BadRequest to raised.
The following assertions occur:
- Expecting the BadRequest Exception to be raised.
"""
@ -128,6 +135,7 @@ class ServerMissingParameterTests(ComputeFixture):
This will call the rebuild through cloudcafe's server client
without an image and expect a BadRequest to raised.
The following assertions occur:
- Expecting the BadRequest Exception to be raised.
"""
@ -141,6 +149,7 @@ class ServerMissingParameterTests(ComputeFixture):
This will call the resize through the cloudcafe's server client
without a flavor parameter.
The following assertions occur:
- Expecting the BadRequest Exception to be raised.
"""
@ -154,6 +163,7 @@ class ServerMissingParameterTests(ComputeFixture):
This will call the create_image through the cloudcafe's server client
without a name parameter.
The following assertions occur:
- Expecting the BadRequest Exception to be raised.
"""

View File

@ -23,11 +23,11 @@ class ServerMetadataTest(ComputeFixture):
@classmethod
def setUpClass(cls):
"""
Perform actions that setup the necessary resources for testing
Perform actions that setup the necessary resources for testing.
The following resources are created/defined during the setup
- Uses server behaviors to create active server
- Adds server id to resources with the function to delete_server
- Uses server behaviors to create active server.
- Adds server id to resources with the function to delete_server.
"""
super(ServerMetadataTest, cls).setUpClass()
server_response = cls.server_behaviors.create_active_server()
@ -54,6 +54,7 @@ class ServerMetadataTest(ComputeFixture):
All metadata key/value pairs for a server should be returned.
This will call the list_server_metadata passing in the server id.
The following assertions occur:
- 200 status code from the http call.
- meta_key_1 key has meta_value_1 for value.
@ -76,6 +77,7 @@ class ServerMetadataTest(ComputeFixture):
set, pull the response and making sure the new values are there and
the old values are not. Lastly will call list_server_metadata and
be sure the same holds true.
The following assertions occur:
- 200 status on the set_server_metadata.
- meta2 key in set_server_metadata result has data2.
@ -117,6 +119,7 @@ class ServerMetadataTest(ComputeFixture):
Will use the existing server created in setup to add new and update
meta_key_1 key to value alt3. Calling the update_server_metadata from
cloudcafe's server client and then list_server_metadata to validate.
The following assertions occur:
- 200 status on the update_server_metadata.
- key1 key in update_server_metadata result has alt1.
@ -154,6 +157,7 @@ class ServerMetadataTest(ComputeFixture):
Calling get_server_metadata_item from cloudcafe's server client
providing it meta_key_1 as the only parameter.
The following assertions occur:
- meta_key_1 key has meta_value_1 value.
"""
@ -165,11 +169,12 @@ class ServerMetadataTest(ComputeFixture):
@tags(type='positive', net='no')
def test_set_server_metadata_item(self):
"""
Set server metadata item call using meta_key_2 key setting it to nova
Set server metadata item call using meta_key_2 key setting it to nova.
Will call the set_server_metadata_item from cloudcafe's server client
passing in the server's id created in setup with meta_key_2 as the
meta data key and nova as the metadata value.
The following assertions occur:
- 200 status on the set_server_metadata_item.
- meta_key_2 key in set_server_metadata_item result has nova.
@ -196,6 +201,7 @@ class ServerMetadataTest(ComputeFixture):
Will call the set_server_metadata_item from cloudcafe's server client
passing in the server's id created in setup with meta_key_3 as the
meta data key and meta_value_3 as the metadata value.
The following assertions occur:
- 200 status on the set_server_metadata_item.
- meta_key_3 key in set_server_metadata_item has meta_value_3.
@ -219,11 +225,12 @@ class ServerMetadataTest(ComputeFixture):
@tags(type='positive', net='no')
def test_delete_server_metadata_item(self):
"""
The metadata value/key pair with key meta_key_1 will be deleted
The metadata value/key pair with key meta_key_1 will be deleted.
Will call the delete_server_metadata_item from cloudcafe's server
client passing in the server's id created in setup with meta_key_1
as the meta data key.
The following assertions occur:
- 204 status on the delete_server_metadata_item.
- meta_key_1 key not in list_server_metadata result.

View File

@ -42,6 +42,7 @@ class ServersTest(ComputeFixture):
oldslice129690TuG72Bgj2. Calls cloudcafe's server behaviors get
remote instance client with the password to validate that it can
authenticate wth password.
The following assertions occur:
- Defined password is the same as the admin password.
- get_remote_instance_client has a true value for can_authenticate
@ -71,6 +72,7 @@ class ServersTest(ComputeFixture):
ipv6 address 3ffe:1900:4545:3:200:f8ff:fe21:67cf and then waiting for
the server to make it to active status. Calling get_server to validate
the updates occurred correctly
The following assertions occur:
- Server name was updated with new random name.
- Server's IPV4 address is 192.168.32.16.

View File

@ -44,6 +44,7 @@ class ServerMetadataTest(ComputeFixture):
Using the delete_server_metadata_item call from servers client,
passing in the "meta_key_5" for the key and expecting ItemNotFound.
The following assertions occur:
- Expecting the ItemNotFound Exception to be raised.
"""
@ -58,6 +59,7 @@ class ServerMetadataTest(ComputeFixture):
Using the get_server_metadata_item call from servers client,
passing in the "meta_key_5" for the key and expecting ItemNotFound.
The following assertions occur:
- Expecting the ItemNotFound Exception to be raised.
"""
@ -72,6 +74,7 @@ class ServerMetadataTest(ComputeFixture):
Using the create_server call from servers client,
passing in blank key and value and expecting BadRequest.
The following assertions occur:
- Expecting the BadRequest Exception to be raised.
"""
@ -88,6 +91,7 @@ class ServerMetadataTest(ComputeFixture):
Using the get_server_metadata_item call from servers client,
passing in 999 as the server id and expecting ItemNotFound.
The following assertions occur:
- Expecting the ItemNotFound Exception to be raised.
"""
@ -101,6 +105,7 @@ class ServerMetadataTest(ComputeFixture):
Using the list_server_metadata call from servers client,
passing in 999 as the server id and expecting ItemNotFound.
The following assertions occur:
- Expecting the ItemNotFound Exception to be raised.
"""
@ -114,6 +119,7 @@ class ServerMetadataTest(ComputeFixture):
Using the set_server_metadata call from servers client,
passing in 999 as the server id and expecting ItemNotFound.
The following assertions occur:
- Expecting the ItemNotFound Exception to be raised.
"""
@ -129,6 +135,7 @@ class ServerMetadataTest(ComputeFixture):
Using the update_server_metadata call from servers client,
passing in 999 as the server id and expecting ItemNotFound.
The following assertions occur:
- Expecting the ItemNotFound Exception to be raised.
"""
@ -143,6 +150,7 @@ class ServerMetadataTest(ComputeFixture):
Using the delete_server_metadata_item call from servers client,
passing in 999 as the server id and expecting ItemNotFound.
The following assertions occur:
- Expecting the ItemNotFound Exception to be raised.
"""