diff options
author | Hansen, Tony (th1395) <th1395@att.com> | 2020-05-13 18:55:54 +0000 |
---|---|---|
committer | Hansen, Tony (th1395) <th1395@att.com> | 2020-06-02 20:36:06 +0000 |
commit | 7e1efe3174336fa09a56c596af55ba93d7b14a91 (patch) | |
tree | bad0fc0c5bb0a54f69e7d046008c423c507f87d6 /relationships | |
parent | 05e95de3b9736160b4229232903e86706fb782e1 (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 'relationships')
-rw-r--r-- | relationships/.gitignore | 67 | ||||
-rw-r--r-- | relationships/LICENSE.txt | 5 | ||||
-rw-r--r-- | relationships/example_register_to_blueprint.yaml | 3 | ||||
-rw-r--r-- | relationships/pom.xml | 1 | ||||
-rw-r--r-- | relationships/relationship-types.yaml | 3 | ||||
-rw-r--r-- | relationships/relationshipplugin/__init__.py | 3 | ||||
-rw-r--r-- | relationships/relationshipplugin/discovery.py | 3 | ||||
-rw-r--r-- | relationships/relationshipplugin/tasks.py | 5 | ||||
-rw-r--r-- | relationships/setup.py | 3 | ||||
-rw-r--r-- | relationships/tests/test_discovery.py | 3 | ||||
-rw-r--r-- | relationships/tox.ini | 5 |
11 files changed, 15 insertions, 86 deletions
diff --git a/relationships/.gitignore b/relationships/.gitignore index 5c75135..c0b2113 100644 --- a/relationships/.gitignore +++ b/relationships/.gitignore @@ -1,59 +1,5 @@ +# local additions to plugins .gitignore cfyhelper.sh -.cloudify/ -*.wgn -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -env/ -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -*.egg-info/ -.installed.cfg -*.egg - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*,cover -.hypothesis/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log local_settings.py # Flask stuff: @@ -63,12 +9,6 @@ instance/ # Scrapy stuff: .scrapy -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - # Jupyter Notebook .ipynb_checkpoints @@ -81,11 +21,6 @@ celerybeat-schedule # dotenv .env -# virtualenv -.venv/ -venv/ -ENV/ - # Spyder project settings .spyderproject diff --git a/relationships/LICENSE.txt b/relationships/LICENSE.txt index cb8008a..a4ece14 100644 --- a/relationships/LICENSE.txt +++ b/relationships/LICENSE.txt @@ -1,7 +1,7 @@ ============LICENSE_START======================================================= org.onap.dcae ================================================================================ -Copyright (c) 2017 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,10 +16,9 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= -ECOMP is a trademark and service mark of AT&T Intellectual Property. -Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. =================================================================== Licensed under the Creative Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except in compliance with the License. diff --git a/relationships/example_register_to_blueprint.yaml b/relationships/example_register_to_blueprint.yaml index 6d01f3e..59a9fe4 100644 --- a/relationships/example_register_to_blueprint.yaml +++ b/relationships/example_register_to_blueprint.yaml @@ -1,5 +1,5 @@ # ================================================================================ -# 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. @@ -14,7 +14,6 @@ # limitations under the License. # ============LICENSE_END========================================================= # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. tosca_definitions_version: cloudify_dsl_1_3 imports: diff --git a/relationships/pom.xml b/relationships/pom.xml index 6b2de69..713f957 100644 --- a/relationships/pom.xml +++ b/relationships/pom.xml @@ -16,7 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= -ECOMP is a trademark and service mark of AT&T Intellectual Property. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> diff --git a/relationships/relationship-types.yaml b/relationships/relationship-types.yaml index 25e86e7..9919cd8 100644 --- a/relationships/relationship-types.yaml +++ b/relationships/relationship-types.yaml @@ -1,5 +1,5 @@ # ================================================================================ -# 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. @@ -14,7 +14,6 @@ # limitations under the License. # ============LICENSE_END========================================================= # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. tosca_definitions_version: cloudify_dsl_1_3 imports: diff --git a/relationships/relationshipplugin/__init__.py b/relationships/relationshipplugin/__init__.py index 259e52c..e342af3 100644 --- a/relationships/relationshipplugin/__init__.py +++ b/relationships/relationshipplugin/__init__.py @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2017 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. from .tasks import add_relationship, remove_relationship, \ diff --git a/relationships/relationshipplugin/discovery.py b/relationships/relationshipplugin/discovery.py index 1b87a65..ec1b576 100644 --- a/relationships/relationshipplugin/discovery.py +++ b/relationships/relationshipplugin/discovery.py @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-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"); @@ -17,7 +17,6 @@ # limitations under the License. # ============LICENSE_END========================================================= # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. try: from urllib.parse import urlparse diff --git a/relationships/relationshipplugin/tasks.py b/relationships/relationshipplugin/tasks.py index b17403c..094c8c7 100644 --- a/relationships/relationshipplugin/tasks.py +++ b/relationships/relationshipplugin/tasks.py @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2017 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 json from cloudify import ctx @@ -107,7 +106,7 @@ def registered_to(**kwargs): #Storing in source because that's who is getting registered ctx.source.instance.runtime_properties[CONSUL_HOST] = "http://{0}:{1}".format(consul_host, consul_port) ctx.source.instance.runtime_properties["name_to_register"] = name #careful! delete does not have access to inputs - + try: response = requests.put(url = "{0}/v1/agent/service/register".format(ctx.source.instance.runtime_properties[CONSUL_HOST]), json = { diff --git a/relationships/setup.py b/relationships/setup.py index c4eb941..4687138 100644 --- a/relationships/setup.py +++ b/relationships/setup.py @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-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"); @@ -17,7 +17,6 @@ # limitations under the License. # ============LICENSE_END========================================================= # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. import os from setuptools import setup diff --git a/relationships/tests/test_discovery.py b/relationships/tests/test_discovery.py index 808b413..2dbc919 100644 --- a/relationships/tests/test_discovery.py +++ b/relationships/tests/test_discovery.py @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2017 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 relationshipplugin import discovery as dis diff --git a/relationships/tox.ini b/relationships/tox.ini index c734632..a9e10a0 100644 --- a/relationships/tox.ini +++ b/relationships/tox.ini @@ -1,5 +1,6 @@ [tox] -envlist = py27,py36,cov +envlist = py27,py36,py37,py38,cov +skip_missing_interpreters = true [testenv] # coverage can only find modules if pythonpath is set @@ -24,6 +25,8 @@ setenv= commands= coverage combine coverage xml + coverage report + coverage html [pytest] junit_family = xunit2 |