Merge "Toxify for docker and relationship"

8 files changed, 44 insertions, 27 deletions

diff --git a/docker/.coveragerc b/docker/.coveragerc
new file mode 100644
index 0000000..088c2da
--- /dev/null
+++ b/docker/.coveragerc
@@ -0,0 +1,21 @@
+# .coveragerc to control coverage.py
+[run]
+branch = True
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain about missing debug-only code:
+    def __repr__
+    if self\.debug
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AssertionError
+    raise NotImplementedError
+
+    # Don't complain if non-runnable code isn't run:
+    if 0:
+    if __name__ == .__main__.:
diff --git a/docker/dockerplugin/tasks.py b/docker/dockerplugin/tasks.py
index 9d33a8b..ff2f2af 100644
--- a/docker/dockerplugin/tasks.py
+++ b/docker/dockerplugin/tasks.py
@@ -25,7 +25,7 @@ from cloudify import ctx
 from cloudify.decorators import operation
 from cloudify.exceptions import NonRecoverableError, RecoverableError
 import dockering as doc
-from dcaepolicy import Policies, POLICIES, POLICY_MESSAGE_TYPE
+from onap_dcae_dcaepolicy_lib import Policies, POLICIES, POLICY_MESSAGE_TYPE
 from dockerplugin import discovery as dis
 from dockerplugin.decorators import monkeypatch_loggers, wrap_error_handling_start, \
     merge_inputs_for_start, merge_inputs_for_create
diff --git a/docker/requirements.txt b/docker/requirements.txt
index 2845551..ac9dd08 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -1,5 +1,2 @@
-# TODO: May need to add the following line
-# --extra-index-url <onap pypi url>
---extra-index-url {{ ONAPTEMPLATE_PYPIURL_org_onap_dcaegen2 }}
-python-dockering==1.3.0
-dcaepolicy==1.0.0
+onap-dcae-dockering==1.3.0
+onap-dcae-dcaepolicy-lib==1.0.0
diff --git a/docker/setup.py b/docker/setup.py
index cdb79d1..ececb43 100644
--- a/docker/setup.py
+++ b/docker/setup.py
@@ -30,8 +30,8 @@ setup(
     zip_safe=False,
     install_requires=[
         "python-consul>=0.6.0,<1.0.0",
-        "python-dockering>=1.0.0,<2.0.0",
+        "onap-dcae-dockering>=1.0.0,<2.0.0",
         "uuid==1.30",
-        "dcaepolicy>=1.0.0"
+        "onap-dcae-dcaepolicy-lib>=1.0.0"
     ]
 )
diff --git a/docker/tox.ini b/docker/tox.ini
new file mode 100644
index 0000000..9a4b7f8
--- /dev/null
+++ b/docker/tox.ini
@@ -0,0 +1,11 @@
+# content of: tox.ini , put in same dir as setup.py
+[tox]
+envlist = py27
+
+[testenv]
+deps=
+    cloudify-plugins-common==3.4
+    pytest
+    coverage
+    pytest-cov
+commands=pytest --junitxml xunit-results.xml --cov {envsitepackagesdir}/dockerplugin --cov-report=xml
diff --git a/relationships/requirements.txt b/relationships/requirements.txt
index 59c8c70..af1659c 100644
--- a/relationships/requirements.txt
+++ b/relationships/requirements.txt
@@ -1,6 +1,4 @@
 bottle==0.12.7
-cloudify-plugins-common==3.4
-cloudify-rest-client==3.4
 Jinja2==2.7.2
 MarkupSafe==0.23
 networkx==1.8.1
diff --git a/relationships/setup.py b/relationships/setup.py
index fbbf077..e576d3c 100644
--- a/relationships/setup.py
+++ b/relationships/setup.py
@@ -29,7 +29,6 @@ setup(
     packages=['relationshipplugin'],
     zip_safe=False,
     install_requires=[
-        "python-consul>=0.6.0",
-        "cloudify-plugins-common==3.4.0"
+        "python-consul>=0.6.0"
     ]
 )
diff --git a/relationships/tox.ini b/relationships/tox.ini
index 2e31087..5d8f4ae 100644
--- a/relationships/tox.ini
+++ b/relationships/tox.ini
@@ -1,20 +1,11 @@
+# content of: tox.ini , put in same dir as setup.py
 [tox]
 envlist = py27
+
 [testenv]
 deps=
-    pytest
-    uuid==1.30
-    cloudify==3.4
-    bottle==0.12.7
     cloudify-plugins-common==3.4
-    cloudify-rest-client==3.4
-    Jinja2==2.7.2
-    MarkupSafe==0.23
-    networkx==1.8.1
-    pika==0.9.14
-    proxy-tools==0.1.0
-    python-consul==0.6.1
-    requests==2.7.0
-    requests-toolbelt==0.7.0
-    six==1.10.0
-commands=pytest
+    pytest
+    coverage
+    pytest-cov
+commands=pytest --junitxml xunit-results.xml --cov {envsitepackagesdir}/relationshipplugin --cov-report=xml