summaryrefslogtreecommitdiffstats
path: root/k8s/tests
diff options
context:
space:
mode:
authorHansen, Tony (th1395) <th1395@att.com>2020-05-13 18:55:54 +0000
committerHansen, Tony (th1395) <th1395@att.com>2020-06-02 20:36:06 +0000
commit7e1efe3174336fa09a56c596af55ba93d7b14a91 (patch)
treebad0fc0c5bb0a54f69e7d046008c423c507f87d6 /k8s/tests
parent05e95de3b9736160b4229232903e86706fb782e1 (diff)
move plugins from from ccsdk to dcaegen2
copy dmaap, helm, pgaas and sshkeyshare plugins from ccsdk to dcaegen2 Change-Id: Ib257495de6c275c45f0c87a4b42ac21a2fab7979 Signed-off-by: Hansen, Tony (th1395) <th1395@att.com> Issue-ID: DCAEGEN2-2207 Signed-off-by: Hansen, Tony (th1395) <th1395@att.com>
Diffstat (limited to 'k8s/tests')
-rw-r--r--k8s/tests/common.py2
-rw-r--r--k8s/tests/conftest.py3
-rw-r--r--k8s/tests/test_decorators.py5
-rw-r--r--k8s/tests/test_discovery.py11
-rw-r--r--k8s/tests/test_k8sclient.py2
-rw-r--r--k8s/tests/test_k8sclient_deploy.py2
-rw-r--r--k8s/tests/test_tasks.py3
-rw-r--r--k8s/tests/test_utils.py3
8 files changed, 13 insertions, 18 deletions
diff --git a/k8s/tests/common.py b/k8s/tests/common.py
index 02b57e6..1801433 100644
--- a/k8s/tests/common.py
+++ b/k8s/tests/common.py
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# org.onap.dcae
# ================================================================================
-# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2020 AT&T Intellectual Property. All rights reserved.
# Copyright (c) 2020 Pantheon.tech. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/k8s/tests/conftest.py b/k8s/tests/conftest.py
index 4716b5a..ae09da1 100644
--- a/k8s/tests/conftest.py
+++ b/k8s/tests/conftest.py
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# org.onap.dcae
# ================================================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-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.
@@ -16,7 +16,6 @@
# limitations under the License.
# ============LICENSE_END=========================================================
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
import pytest
diff --git a/k8s/tests/test_decorators.py b/k8s/tests/test_decorators.py
index 552fa4b..2cb8288 100644
--- a/k8s/tests/test_decorators.py
+++ b/k8s/tests/test_decorators.py
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# org.onap.dcae
# ================================================================================
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-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.
@@ -16,7 +16,6 @@
# limitations under the License.
# ============LICENSE_END=========================================================
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
def test_wrapper_merge_inputs(mockconfig):
from k8splugin import decorators as dec
@@ -31,4 +30,4 @@ def test_wrapper_merge_inputs(mockconfig):
expected = { "app_config": {"nested": { "a": 789, "b": 456, "c": "zyx" },
"foo": "duh"}, "image": "some-docker-image" }
- assert expected == dec._wrapper_merge_inputs(task_func, properties, **kwargs) \ No newline at end of file
+ assert expected == dec._wrapper_merge_inputs(task_func, properties, **kwargs)
diff --git a/k8s/tests/test_discovery.py b/k8s/tests/test_discovery.py
index 24e45ee..660a820 100644
--- a/k8s/tests/test_discovery.py
+++ b/k8s/tests/test_discovery.py
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# org.onap.dcae
# ================================================================================
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-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.
@@ -16,7 +16,6 @@
# limitations under the License.
# ============LICENSE_END=========================================================
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
import pytest
from functools import partial
@@ -24,7 +23,7 @@ import requests
def test_wrap_consul_call(mockconfig):
from k8splugin import discovery as dis
-
+
def foo(a, b, c="default"):
return " ".join([a, b, c])
@@ -41,11 +40,11 @@ def test_wrap_consul_call(mockconfig):
def test_generate_service_component_name(mockconfig):
from k8splugin import discovery as dis
-
+
component_type = "some-component-type"
name = dis.generate_service_component_name(component_type)
assert name.split("-", 1)[1] == component_type
-
+
def test_find_matching_services(mockconfig):
from k8splugin import discovery as dis
@@ -68,4 +67,4 @@ def test_is_healthy_pure(mockconfig):
def fake_is_healthy(name):
return 0, [{ "Checks": [{"Status": "passing"}] }]
- assert True == dis._is_healthy_pure(fake_is_healthy, "some-component") \ No newline at end of file
+ assert True == dis._is_healthy_pure(fake_is_healthy, "some-component")
diff --git a/k8s/tests/test_k8sclient.py b/k8s/tests/test_k8sclient.py
index fcc6b95..4f669d8 100644
--- a/k8s/tests/test_k8sclient.py
+++ b/k8s/tests/test_k8sclient.py
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# org.onap.dcae
# ================================================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
# Copyright (c) 2019 Pantheon.tech. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/k8s/tests/test_k8sclient_deploy.py b/k8s/tests/test_k8sclient_deploy.py
index 4e8a11d..3755855 100644
--- a/k8s/tests/test_k8sclient_deploy.py
+++ b/k8s/tests/test_k8sclient_deploy.py
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# org.onap.dcae
# ================================================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-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.
diff --git a/k8s/tests/test_tasks.py b/k8s/tests/test_tasks.py
index 7f5d753..b82a4ae 100644
--- a/k8s/tests/test_tasks.py
+++ b/k8s/tests/test_tasks.py
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# org.onap.dcae
# ================================================================================
-# Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-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.
@@ -16,7 +16,6 @@
# limitations under the License.
# ============LICENSE_END=========================================================
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
import copy
import pytest
diff --git a/k8s/tests/test_utils.py b/k8s/tests/test_utils.py
index 0b7cba4..7e01a91 100644
--- a/k8s/tests/test_utils.py
+++ b/k8s/tests/test_utils.py
@@ -1,7 +1,7 @@
# ============LICENSE_START=======================================================
# org.onap.dcae
# ================================================================================
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-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.
@@ -16,7 +16,6 @@
# limitations under the License.
# ============LICENSE_END=========================================================
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
def test_random_string(mockconfig):
from k8splugin import utils