diff --git a/README.rst b/README.rst index d1e23c57..807be9f9 100644 --- a/README.rst +++ b/README.rst @@ -17,7 +17,7 @@ across Neutron servers in multi-region OpenStack clouds deployment. Each OpenStack cloud includes its own Nova, Cinder and Neutron, the Neutron servers in these OpenStack clouds are called local Neuron servers, all these local Neutron servers will be configured with the Tricircle Local Neutron -Plugin. A seperate Neutron server will be installed and run standalone as +Plugin. A separate Neutron server will be installed and run standalone as the coordinator of networking automation across local Neutron servers, this Neutron server will be configured with the Tricircle Central Neutron Plugin, and is called central Neutron server. @@ -52,4 +52,4 @@ detailed in the LICENSE file. * Bugs: http://bugs.launchpad.net/tricircle * Blueprints: https://blueprints.launchpad.net/tricircle * Release notes: https://github.com/openstack/tricircle/tree/master/releasenotes/notes -* Contributing: http://docs.openstack.org/developer/tricircle/contributing.html \ No newline at end of file +* Contributing: http://docs.openstack.org/developer/tricircle/contributing.html diff --git a/specs/newton/cross-pod-l2-networking.rst b/specs/newton/cross-pod-l2-networking.rst index 1a2a5848..91a08278 100644 --- a/specs/newton/cross-pod-l2-networking.rst +++ b/specs/newton/cross-pod-l2-networking.rst @@ -38,7 +38,7 @@ Problem Description When a user wants to create a network in Neutron API Server, the user can specify the 'availability_zone_hints'(AZ or az will be used for short for availability zone) during network creation[5], in the Tricircle, the -'az_hints' means which AZ the network should be spreaded into. The 'az_hints' +'az_hints' means which AZ the network should be spread into. The 'az_hints' meaning in Tricircle is a little different from the 'az_hints' meaning in Neutron[5]. If no 'az_hints' was specified during network creation, this created network will be spread into any AZ. If there is a list of 'az_hints' during the @@ -300,7 +300,7 @@ checks the configuration, if ``tenant_network_type`` equals ``local_network``, it will invoke Local Network type driver. Local Network driver under the Tricircle plugin will update ``network_type`` in database. -For exmaple, a user creates VM1 in AZ1 which has only one pod ``POD1``, and +For example, a user creates VM1 in AZ1 which has only one pod ``POD1``, and connects it to network ``Net1``. ``Nova API-GW`` will send network creation request to ``POD1`` and the VM will be booted in AZ1 (There should be only one pod in AZ1). @@ -560,4 +560,4 @@ References [5] http://docs.openstack.org/mitaka/networking-guide/adv-config-availability-zone.html -[6] https://review.openstack.org/#/c/306224/ \ No newline at end of file +[6] https://review.openstack.org/#/c/306224/ diff --git a/tricircle/tempestplugin/post_test_hook.sh b/tricircle/tempestplugin/post_test_hook.sh index 3943f0d0..e79712fb 100755 --- a/tricircle/tempestplugin/post_test_hook.sh +++ b/tricircle/tempestplugin/post_test_hook.sh @@ -41,7 +41,7 @@ curl -X POST http://127.0.0.1:19999/v1.0/pods \ # nova flavor-create [--ephemeral ] [--swap ] # [--rxtx-factor ] [--is-public ] # -# the following command is to create a flavor wih name='test', +# the following command is to create a flavor with name='test', # id=1, ram=1024MB, disk=10GB, vcpu=1 # nova flavor-create test 1 1024 10 1 image_id=$(openstack image list | awk 'NR==4 {print $2}') diff --git a/tricircle/tests/functional/api/controllers/test_pod.py b/tricircle/tests/functional/api/controllers/test_pod.py index 2dd51456..c988b054 100644 --- a/tricircle/tests/functional/api/controllers/test_pod.py +++ b/tricircle/tests/functional/api/controllers/test_pod.py @@ -473,7 +473,7 @@ class TestPodController(API_FunctionalTest): _id = ret_pod['pod_id'] - # check ag and az automaticly added + # check ag and az automatically added ag_name = utils.get_ag_name(ret_pod['pod_name']) ag = az_ag.get_ag_by_name(self.context, ag_name) self.assertIsNotNone(ag)