summaryrefslogtreecommitdiffstats
path: root/k8s/tests/test_decorators.py
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/test_decorators.py
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/test_decorators.py')
-rw-r--r--k8s/tests/test_decorators.py5
1 files changed, 2 insertions, 3 deletions
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)