summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrichomme <morgan.richomme@orange.com>2019-10-30 18:15:11 +0100
committermrichomme <morgan.richomme@orange.com>2019-11-06 17:04:47 +0100
commit6dfdebcf8c7f5243300aabc8179bda0bb5155b49 (patch)
tree7780a471e76fe6b41258e5ac8a18ace0bf9110c6
parentb5b4b229aa28f66bf1b308068dff806f35f475be (diff)
update INFO.yaml
remove 1 year inactive committers Issue-ID: INT-1349 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: I99043f9582245acdfdc22698eb2f0abaaa65f4ab
-rw-r--r--heatbridge/heatbridge/HeatBridge.py12
-rw-r--r--heatbridge/requirements.txt9
-rw-r--r--heatbridge/test-requirements.txt8
-rw-r--r--heatbridge/tox.ini28
4 files changed, 49 insertions, 8 deletions
diff --git a/heatbridge/heatbridge/HeatBridge.py b/heatbridge/heatbridge/HeatBridge.py
index de10793..bdf3e64 100644
--- a/heatbridge/heatbridge/HeatBridge.py
+++ b/heatbridge/heatbridge/HeatBridge.py
@@ -10,7 +10,7 @@ class HeatBridge:
def init_bridge(self, openstack_identity_url, username, password, tenant, region, owner, domain_id=None, project_name=None):
self.om = OpenstackManager(openstack_identity_url, OpenstackContext(username, password, tenant, region, owner, domain_id, project_name));
self.am = AAIManager(OpenstackContext(username, password, tenant, region, owner, domain_id, project_name));
-
+
def filterbyvalue(self, seq, key, value):
for el in seq:
@@ -23,9 +23,9 @@ class HeatBridge:
#subnets = list(self.filterbyvalue(resources, "resource_type", "OS::Neutron::Subnet"));
ports = list(self.filterbyvalue(resources, "resource_type", "OS::Neutron::Port"));
#keys = list(self.filterbyvalue(resources, "resource_type", "OS::Nova::KeyPair"));
-
+
put_blocks = []
-
+
#build the servers and attach them to vnf
server_put_blocks = []
image_put_blocks = []
@@ -60,8 +60,8 @@ class HeatBridge:
put_blocks.extend(linterface_put_blocks);
return json.dumps(self.am.create_transactions(put_blocks));
-
+
def bridge_data(self, heat_stack_id):
request = self.build_request(heat_stack_id);
- print request;
- return request; \ No newline at end of file
+ print(request);
+ return request;
diff --git a/heatbridge/requirements.txt b/heatbridge/requirements.txt
new file mode 100644
index 0000000..f063c3f
--- /dev/null
+++ b/heatbridge/requirements.txt
@@ -0,0 +1,9 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+python-novaclient
+python-cinderclient
+python-glanceclient
+os_client_config
+python-neutronclient
+python-heatclient
diff --git a/heatbridge/test-requirements.txt b/heatbridge/test-requirements.txt
new file mode 100644
index 0000000..1e76c7d
--- /dev/null
+++ b/heatbridge/test-requirements.txt
@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+coverage!=4.4,>=4.0 # Apache-2.0
+nose # LGPL
+flake8 # MIT
+pylint # GPLv2
+more-itertools~=5.0.0
diff --git a/heatbridge/tox.ini b/heatbridge/tox.ini
index 09b4c98..bb7d455 100644
--- a/heatbridge/tox.ini
+++ b/heatbridge/tox.ini
@@ -4,9 +4,33 @@
# and then run "tox" from this directory.
[tox]
-envlist = py27
+envlist = py27,py3
+modules =
+ heatbridge
[testenv]
-commands = {envpython} setup.py test
deps =
+ -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements.txt
+install_command = pip install {opts} {packages}
+
+[testenv:pep8]
+basepython = python3
+changedir = {toxinidir}
+commands =
+ flake8 --max-line-length 120 {[tox]modules}
+
+[testenv:py3]
+basepython = python3
+[testenv:py27]
+basepython = python2.7
+commands = {envpython} setup.py test
+
+[testenv:pylint]
+basepython = python3
+deps =
+ pyflakes
+ pylint
+commands =
+ pylint -f parseable --ignore-imports=y --disable=locally-disabled --max-line-length 120 --exit-zero -ry {[tox]modules}