Merge "Test access control for single host addresses"
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index b273376..aa97335 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,14 +1,14 @@
If you would like to contribute to the development of OpenStack, you must
follow the steps in this page:
- http://docs.openstack.org/infra/manual/developers.html
+ https://docs.openstack.org/infra/manual/developers.html
If you already have a good understanding of how the system works and your
OpenStack accounts are set up, you can skip to the development workflow
section of this documentation to learn how changes to OpenStack should be
submitted for review via the Gerrit tool:
- http://docs.openstack.org/infra/manual/developers.html#development-workflow
+ https://docs.openstack.org/infra/manual/developers.html#development-workflow
Pull requests submitted through GitHub will be ignored.
diff --git a/README.rst b/README.rst
index f2ccb6a..0a2d95b 100644
--- a/README.rst
+++ b/README.rst
@@ -7,9 +7,10 @@
Tempest plugin to test Manila's features
* Free software: Apache license
-* Documentation: http://docs.openstack.org/developer/openstack
-* Source: http://git.openstack.org/cgit/openstack/manila-tempest-plugin
-* Bugs: http://bugs.launchpad.net/manila-tempest-plugin
+* Documentation: https://docs.openstack.org/manila/latest/
+* Release notes: https://docs.openstack.org/releasenotes/manila/
+* Source: https://git.openstack.org/cgit/openstack/manila-tempest-plugin
+* Bugs: https://bugs.launchpad.net/manila-tempest-plugin
Features
--------
diff --git a/manila_tempest_tests/tests/api/base.py b/manila_tempest_tests/tests/api/base.py
index d8bd45a..2f896ec 100644
--- a/manila_tempest_tests/tests/api/base.py
+++ b/manila_tempest_tests/tests/api/base.py
@@ -991,8 +991,8 @@
client.wait_for_resource_deletion(snapshot_id=res_id)
elif (res["type"] is "share_network" and
res_id != CONF.share.share_network_id):
- client.delete_share_network(res_id)
- client.wait_for_resource_deletion(sn_id=res_id)
+ client.delete_share_network(res_id)
+ client.wait_for_resource_deletion(sn_id=res_id)
elif res["type"] is "security_service":
client.delete_security_service(res_id)
client.wait_for_resource_deletion(ss_id=res_id)
diff --git a/setup.cfg b/setup.cfg
index ef00627..8b6a100 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@
README.rst
author = OpenStack
author-email = openstack-dev@lists.openstack.org
-home-page = http://www.openstack.org/
+home-page = https://www.openstack.org/
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@@ -48,4 +48,4 @@
[entry_points]
tempest.test_plugins =
- manila_tests = manila_tempest_tests.plugin:ManilaTempestPlugin
\ No newline at end of file
+ manila_tests = manila_tempest_tests.plugin:ManilaTempestPlugin