Improve code coverage of Acumos-DCAE adapter1.0.4-adapter-acumos

Adding and modifying unit test scripts to increase code coverage of the Acumos-DCAE adapter

Issue-ID: DCAEGEN2-2633
Signed-off-by: shabs2020 <shabnam.sultana@highstreet-technologies.com>
Change-Id: I22e752d8ce33373b3326757594445e0288874b35
Signed-off-by: shabs2020 <shabnam.sultana@highstreet-technologies.com>

7 files changed, 161 insertions, 4 deletions

diff --git a/adapter/acumos/setup.py b/adapter/acumos/setup.py
index 35c7273..d667f0b 100644
--- a/adapter/acumos/setup.py
+++ b/adapter/acumos/setup.py
@@ -20,7 +20,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aoconversion",
-    version="1.0.3",
+    version="1.0.4-SNAPSHOT",
     packages=find_packages(exclude=["tests.*", "tests"]),
     author="Tommy Carpenter, Andrew Gauld",
     author_email="tommy@research.att.com, agauld@att.com",
diff --git a/adapter/acumos/tests/conftest.py b/adapter/acumos/tests/conftest.py
index 80351c8..4219f66 100644
--- a/adapter/acumos/tests/conftest.py
+++ b/adapter/acumos/tests/conftest.py
@@ -19,7 +19,9 @@
 import os
 import pytest
 import requests
+
 import aoconversion
+from tests import testing_helpers
 
 
 @pytest.fixture
@@ -29,3 +31,43 @@ def mock_schemas(monkeypatch):
     monkeypatch.setattr(aoconversion.utils.component_schema, 'path', schemadir + '/component-specification/dcae-cli-v2/component-spec-schema.json')
     monkeypatch.setattr(aoconversion.utils.dataformat_schema, 'path', schemadir + '/data-format/dcae-cli-v1/data-format-schema.json')
     monkeypatch.setattr(aoconversion.utils.schema_schema, 'ret', requests.get('https://json-schema.org/draft-04/schema#').json())
+
+
+def test_get_metadata():
+    model_repo_path = testing_helpers.get_fixture_path('models')
+    model_name = 'example-model'
+    assert (aoconversion.utils.get_metadata(model_repo_path, model_name) == {
+        "schema": "acumos.schema.model:0.4.0",
+        "runtime": {
+            "name": "python",
+            "encoding": "protobuf",
+            "version": "3.6.8",
+            "dependencies": {
+                "pip": {
+                    "indexes": [],
+                    "requirements": [
+                        {
+                            "name": "dill",
+                            "version": "0.3.0"
+                        },
+                        {
+                            "name": "acumos",
+                            "version": "0.8.0"
+                        }
+                    ]
+                },
+                "conda": {
+                    "channels": [],
+                    "requirements": []
+                }
+            }
+        },
+        "name": "example-model",
+        "methods": {
+            "add": {
+                "input": "NumbersIn",
+                "output": "NumberOut",
+                "description": "Adds two integers"
+            }
+        }
+    })
diff --git a/adapter/acumos/tests/fixtures/config.yaml b/adapter/acumos/tests/fixtures/config.yaml
new file mode 100644
index 0000000..207fe0c
--- /dev/null
+++ b/adapter/acumos/tests/fixtures/config.yaml
@@ -0,0 +1,10 @@
+dcaeurl: https://git.onap.org/dcaegen2/platform/plain/mod
+dcaeuser: aoadapter
+onboardingurl: http://dcaemod-onboarding-api:8080/onboarding
+onboardinguser: ''
+onboardingpass: ''
+certfile: /run/certs/cert.pem
+dockerregistry: 'dockerregistry'
+dockeruser: 'dockeruser'
+dockerpass: 'dockerpass'
+port: '90'
\ No newline at end of file
diff --git a/adapter/acumos/tests/test_convert.py b/adapter/acumos/tests/test_convert.py
new file mode 100644
index 0000000..780cc55
--- /dev/null
+++ b/adapter/acumos/tests/test_convert.py
@@ -0,0 +1,92 @@
+# ============LICENSE_START====================================================
+# org.onap.dcae
+# =============================================================================
+# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
+# =============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END======================================================
+'''
+Unit tests for convert.py
+should return docker_uri, dataformat and spec
+'''
+
+import aoconversion
+from testing_helpers import get_fixture_path
+
+
+def test_gen_dcae_artifacts_for_model(monkeypatch):
+    model_repo_path = get_fixture_path('models')
+    model_name = 'example-model'
+    config = aoconversion.scanner.Config(dcaeurl='http://dcaeurl', dcaeuser='dcaeuser', onboardingurl='https://onboarding', onboardinguser='obuser', onboardingpass='obpass', acumosurl='https://acumos', certfile=None, dockerregistry='dockerregistry', dockeruser='registryuser', dockerpass='registrypassword', tmpdir=model_repo_path)
+    spec = {
+        "self": {
+            "version": "1.0.0",
+            "name": "example-model",
+            "description": "Automatically generated from Acumos model",
+            "component_type": "docker",
+        },
+        "services": {"calls": [], "provides": []},
+        "streams": {
+            "subscribes": [
+                {"config_key": "add_subscriber", "format": "NumbersIn", "version": "1.0.0", "type": "message_router"}
+            ],
+            "publishes": [
+                {"config_key": "add_publisher", "format": "NumberOut", "version": "1.0.0", "type": "message_router"}
+            ],
+        },
+        "parameters": [],
+        "auxilary": {"healthcheck": {"type": "http", "endpoint": "/healthcheck"}},
+        "artifacts": [{"type": "docker image", "uri": "nexus01.fake.com:18443/example-model:latest"}],
+    }
+    dataformat = [
+        {
+            "self": {"name": "NumbersIn", "version": "1.0.0"},
+            "dataformatversion": "1.0.1",
+            "jsonschema": {
+                "title": "NumbersIn",
+                "type": "object",
+                "properties": {
+                    "x": {"type": "integer", "minimum": -9007199254740991, "maximum": 9007199254740991},
+                    "y": {"type": "integer", "minimum": -9007199254740991, "maximum": 9007199254740991},
+                },
+                "$schema": "http://json-schema.org/draft-04/schema#",
+                "definitions": {},
+            },
+        },
+        {
+            "self": {"name": "NumberOut", "version": "1.0.0"},
+            "dataformatversion": "1.0.1",
+            "jsonschema": {
+                "title": "NumberOut",
+                "type": "object",
+                "properties": {"result": {"type": "integer", "minimum": -9007199254740991, "maximum": 9007199254740991}},
+                "$schema": "http://json-schema.org/draft-04/schema#",
+                "definitions": {},
+            },
+        },
+    ]
+    dockeruri = 'dockerregistry/example-model:latest'
+
+    def mockreturn_dockeruri(config, model_name, model_version='latest'):
+        return dockeruri
+
+    def mockreturn_dataformats(model_repo_path, model_name):
+        return dataformat
+
+    def mockreturn_spec(model_repo_path, model_name, dataformat, dockeruri):
+        return spec
+
+    monkeypatch.setattr(aoconversion.docker_gen, 'build_and_push_docker', mockreturn_dockeruri)
+    monkeypatch.setattr(aoconversion.dataformat_gen, 'generate_dcae_data_formats', mockreturn_dataformats)
+    monkeypatch.setattr(aoconversion.spec_gen, 'generate_spec', mockreturn_spec)
+    assert aoconversion.convert.gen_dcae_artifacts_for_model(config, model_name, 'latest') == (dockeruri, dataformat, spec)
diff --git a/adapter/acumos/tests/test_docker.py b/adapter/acumos/tests/test_docker.py
index 0d84038..2f618e6 100644
--- a/adapter/acumos/tests/test_docker.py
+++ b/adapter/acumos/tests/test_docker.py
@@ -16,8 +16,9 @@
 # limitations under the License.
 # ============LICENSE_END======================================================
 
-from testing_helpers import get_json_fixture
-from aoconversion import docker_gen
+from testing_helpers import get_json_fixture, get_fixture_path
+from aoconversion import docker_gen, scanner
+import test_fed
 
 TEST_META = get_json_fixture("models/example-model/metadata.json")
 
@@ -45,3 +46,10 @@ def test_generate_dockerfile():
     CMD ["/app/example-model"]
     """
     )
+
+
+def test_build_and_push_docker(monkeypatch):
+    model_repo_path = get_fixture_path('models')
+    config = scanner.Config(dcaeurl='http://dcaeurl', dcaeuser='dcaeuser', onboardingurl='https://onboarding', onboardinguser='obuser', onboardingpass='obpass', acumosurl='https://acumos', certfile=None, dockerregistry='dockerregistry', dockeruser='registryuser', dockerpass='registrypassword', tmpdir=model_repo_path)
+    monkeypatch.setattr(docker_gen, 'APIClient', test_fed._mockdocker.APIClient)
+    assert(docker_gen.build_and_push_docker(config, 'example-model', model_version="latest") == 'dockerregistry/example-model:latest')
diff --git a/adapter/acumos/tests/test_fed.py b/adapter/acumos/tests/test_fed.py
index 6119976..c5400a3 100644
--- a/adapter/acumos/tests/test_fed.py
+++ b/adapter/acumos/tests/test_fed.py
@@ -172,3 +172,8 @@ def test_aoconversion(mock_schemas, tmpdir, monkeypatch):
     monkeypatch.setattr(requests, 'patch', _mockwww(_mockpatchdata))
     aoc_scanner.scan(config)
     aoc_scanner.scan(config)
+
+
+def test__derefconfig():
+    config_path = get_test_file('config.yaml')
+    assert aoc_scanner._derefconfig('@' + config_path) == 'dcaeurl: https://git.onap.org/dcaegen2/platform/plain/mod'
diff --git a/adapter/acumos/tox.ini b/adapter/acumos/tox.ini
index bc94f22..deebf3b 100644
--- a/adapter/acumos/tox.ini
+++ b/adapter/acumos/tox.ini
@@ -32,7 +32,7 @@ setenv =
 commands=
     nodeenv -p
     npm install --global protobuf-jsonschema
-    pytest --verbose --junitxml xunit-results.xml --cov aoconversion  --cov-report xml --cov-report html
+    pytest --verbose --junitxml xunit-results.xml --cov aoconversion  --cov-report xml --cov-report html --cov-report term
 
 [testenv:flake8]
 basepython = python3.7