summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile2
-rw-r--r--requirements/requirements.txt (renamed from requirements.txt)0
-rw-r--r--requirements/verify.txt10
-rw-r--r--utils/infra_setup/runner/stack.py12
4 files changed, 20 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fc3451ba..69e1d65b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -50,5 +50,5 @@ RUN git clone -b $BRANCH https://gerrit.opnfv.org/gerrit/bottlenecks ${BOTTLENEC
RUN git clone https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
RUN easy_install pytz
-RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements.txt
+RUN pip install -r ${REPOS_DIR}/bottlenecks/requirements/requirements.txt
RUN pip install -U /home/opnfv/bottlenecks
diff --git a/requirements.txt b/requirements/requirements.txt
index 113be337..113be337 100644
--- a/requirements.txt
+++ b/requirements/requirements.txt
diff --git a/requirements/verify.txt b/requirements/verify.txt
new file mode 100644
index 00000000..e8d51f47
--- /dev/null
+++ b/requirements/verify.txt
@@ -0,0 +1,10 @@
+##############################################################################
+# Copyright (c) 2016 Huawei Tech. and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+flake8==3.0.4 \ No newline at end of file
diff --git a/utils/infra_setup/runner/stack.py b/utils/infra_setup/runner/stack.py
index fb78c360..c3fa00a8 100644
--- a/utils/infra_setup/runner/stack.py
+++ b/utils/infra_setup/runner/stack.py
@@ -12,13 +12,20 @@ a template is use to create a stack in openstack.
This file will be amended in the furture.'''
import utils.infra_setup.heat.template as Heat
+import os
+import sys
+import utils.parser as Parser
+
class stack_api():
- def from_config_template(stack_info):
+ def __init__(self):
+ pass
+
+ def from_config_template(self, stack_info):
stack_name = stack_info['name']
ext_gw_net = os.environ.get("EXTERNAL_NETWORK")
- heat_parser = HeatTemplate_Parser()
+ heat_parser = Parser.HeatTemplate_Parser()
heat_parser.add_security_group(stack_name)
heat_parser.add_keypair(stack_name)
for network in stack_info['networks']:
@@ -58,4 +65,3 @@ class stack_api():
if server.floating_ip:
server.public_ip = \
self.stack.outputs[server.floating_ip["stack_name"]]
-