aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdocs/com/pres/conversation.html6
-rwxr-xr-xdocs/com/pres/testapi.html26
-rw-r--r--utils/openstack_utils.py17
3 files changed, 28 insertions, 21 deletions
diff --git a/docs/com/pres/conversation.html b/docs/com/pres/conversation.html
index 0fab448a2..d876e17e2 100755
--- a/docs/com/pres/conversation.html
+++ b/docs/com/pres/conversation.html
@@ -118,10 +118,10 @@
* Performance testing framework and NFVI Validation
* [Contributors](https://wiki.opnfv.org/display/yardstick/People)
* Yardstick presentation
- * How to Do a Pre-deployment NFVI Validation Quickly and Efficiently? Wednesday, June 22, 4:00 PM - 4:30 PM
- * Yardstick: A Pre-deployment NFVI Validation Tool. Thursday, June 23, 3:10 PM - 3:30 PM
+ * How to Do a Pre-deployment NFVI Validation Quickly and Efficiently? Wednesday, June 22, 4:00 PM - 4:30 PM
+ * Yardstick: A Pre-deployment NFVI Validation Tool. Thursday, June 23, 3:10 PM - 3:30 PM
* breakout sessions
- * Tomorrow 2PM (Yardstick in C)
+ * Tomorrow 2PM (Yardstick in C)
</section>
<section data-markdown>
# CPerf
diff --git a/docs/com/pres/testapi.html b/docs/com/pres/testapi.html
index 37a8ea356..a0e266a19 100755
--- a/docs/com/pres/testapi.html
+++ b/docs/com/pres/testapi.html
@@ -62,9 +62,9 @@
</section>
<section data-markdown>
## Give a consistant view for
+ * Test resources (Pods)
* Test projects
* Test cases
- * Test resources (Pods)
* Test results
</section>
@@ -87,17 +87,9 @@
# API overview
</section>
<section data-markdown>
- ## API in Brahmaputra
- * Tornado + MongoDB
- * Simple data models aggreed with the testing group
- * No unit tests
- * Wiki and rst documentation
- </section>
-
- <section data-markdown>
- ## API in Brahmaputra
+ ## API storage structure
![testapi](https://wiki.opnfv.org/download/attachments/2926452/results_collection_structure.png?version=1&modificationDate=1459196347000&api=v2 "OPNFV API page")
- </section>
+ </section>
<section data-markdown>
## API in Brahmaputra
![testapi](../img/testapi0.png)
@@ -105,6 +97,14 @@
</section>
<section data-markdown>
+ ## API in Brahmaputra
+ * Tornado + MongoDB
+ * Simple data models aggreed with the testing group
+ * No unit tests
+ * Wiki and rst documentation
+ </section>
+
+ <section data-markdown>
## Lessons learned in B.
* Wiki documentation is painful
* Result model too simple
@@ -137,8 +137,8 @@
testresults.opnfv.org/test/testapi => testresults.opnfv.org/test/api/v1
http://testresults.opnfv.org/test/api/v1/projects
- http://testresults.opnfv.org/test/api/v1/projects/yardstick/cases
- http://testresults.opnfv.org/test/api/v1/results?case=Tempest&period=1
+ http://testresults.opnfv.org/test/api/v1/projects/qtip/cases
+ http://testresults.opnfv.org/test/api/v1/results?case=Tempest&period=1
</section>
<section>
<h3>One new field for pods</h3>
diff --git a/utils/openstack_utils.py b/utils/openstack_utils.py
index 4084e1fc2..646df7aec 100644
--- a/utils/openstack_utils.py
+++ b/utils/openstack_utils.py
@@ -41,6 +41,14 @@ def get_credentials(service):
requesting the credentials.
"""
creds = {}
+
+ # Check that the env vars exists:
+ envvars = ('OS_USERNAME', 'OS_PASSWORD', 'OS_AUTH_URL', 'OS_TENANT_NAME')
+ for envvar in envvars:
+ if os.getenv(envvar) is None:
+ print("'%s' is not exported as an env variable." % envvar)
+ exit(-1)
+
# Unfortunately, each of the OpenStack client will request slightly
# different entries in their credentials dict.
if service.lower() in ("nova", "cinder"):
@@ -53,11 +61,10 @@ def get_credentials(service):
# The most common way to pass these info to the script is to do it through
# environment variables.
creds.update({
- "username": os.environ.get('OS_USERNAME', "admin"),
- password: os.environ.get("OS_PASSWORD", 'admin'),
- "auth_url": os.environ.get("OS_AUTH_URL",
- "http://192.168.20.71:5000/v2.0"),
- tenant: os.environ.get("OS_TENANT_NAME", "admin"),
+ "username": os.environ.get("OS_USERNAME"),
+ password: os.environ.get("OS_PASSWORD"),
+ "auth_url": os.environ.get("OS_AUTH_URL"),
+ tenant: os.environ.get("OS_TENANT_NAME")
})
cacert = os.environ.get("OS_CACERT")
if cacert is not None: