Unify tox/requirements/setup.py requirement specifications.
Use cloudify-common 5.0.5 release.
For helm, use a dev cloudify-common build with better python3 code.
Use PEP 508 URLs in requirements for the non-PyPI (github) release.
Fix mixed indentation and trailing whitespace.
Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech>
Issue-ID: CCSDK-1931
Change-Id: I607957d9e2c299121785f3f02420c6038966a200
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017-2019 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");
# you may not use this file except in compliance with the License.
import consul
import json
-from urlparse import urlparse
+try:
+ from urllib.parse import urlparse
+except ImportError:
+ from urlparse import urlparse
+
class ConsulHandle(object):
'''
dmaapplugin:
executor: 'central_deployment_agent'
package_name: dmaap
- package_version: 1.3.5
+ package_version: 1.4.0
node_types:
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017-2019 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");
# you may not use this file except in compliance with the License.
locations.raise_for_status()
# pull out location names for VALID locations with matching dcae_layer
- return map(lambda l: l["dcaeLocationName"],
- filter(lambda i : (i['dcaeLayer'] == dcae_layer and i['status'] == 'VALID'),
- locations.json()))
+ return [location["dcaeLocationName"] for location in locations.json()
+ if location['dcaeLayer'] == dcae_layer
+ and location['status'] == 'VALID']
def get_dcae_central_locations(self):
'''
Get the list of location names known to the DMaaP bus controller
- whose "dcaeLayer" property contains "central" (ignoring case) and whose status is "VALID".
+ whose "dcaeLayer" property contains "central" (ignoring case)
+ and whose status is "VALID".
"dcaeLayer" contains "central" for central sites.
'''
# Do these as a separate step so things like 404 get reported precisely
locations.raise_for_status()
# pull out location names for VALID central locations
- return map(lambda l: l["dcaeLocationName"],
- filter(lambda i : ('central' in i['dcaeLayer'].lower() and i['status'] == 'VALID'),
- locations.json()))
+ return [location["dcaeLocationName"] for location in locations.json()
+ if 'central' in location['dcaeLayer'].lower()
+ and location['status'] == 'VALID']
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017-2019 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");
# you may not use this file except in compliance with the License.
from cloudify.exceptions import NonRecoverableError
import os
-os.environ["REQUESTS_CA_BUNDLE"]="/opt/onap/certs/cacert.pem" # This is to handle https request thru plugin
+os.environ["REQUESTS_CA_BUNDLE"]="/opt/onap/certs/cacert.pem" # This is to handle https request thru plugin
CONSUL_HOST = "consul" # Should always be a local consul agent on Cloudify Manager
DBCL_KEY_NAME = "dmaap-plugin" # Consul key containing DMaaP data bus credentials
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017-2019 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");
# you may not use this file except in compliance with the License.
from cloudify.decorators import operation
from cloudify.exceptions import NonRecoverableError
from dmaapplugin import DMAAP_API_URL, DMAAP_USER, DMAAP_PASS
-from dmaaputils import random_string
+from dmaapplugin.dmaaputils import random_string
from dmaapcontrollerif.dmaap_requests import DMaaPControllerHandle
# Set up a subscriber to a source feed
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017-2019 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");
# you may not use this file except in compliance with the License.
from cloudify.decorators import operation
from cloudify.exceptions import NonRecoverableError
from dmaapplugin import DMAAP_API_URL, DMAAP_USER, DMAAP_PASS, DMAAP_OWNER
-from dmaaputils import random_string
+from dmaapplugin.dmaaputils import random_string
from dmaapcontrollerif.dmaap_requests import DMaaPControllerHandle
# Lifecycle operations for DMaaP Data Router feeds
feed_name = random_string(12)
# Set defaults/placeholders for the optional properties for the feed
- if "feed_version" in ctx.node.properties.keys():
+ if "feed_version" in ctx.node.properties:
feed_version = ctx.node.properties["feed_version"]
else:
feed_version = "0.0"
- if "feed_description" in ctx.node.properties.keys():
+ if "feed_description" in ctx.node.properties:
feed_description = ctx.node.properties["feed_description"]
else:
feed_description = "No description provided"
- if "aspr_classification" in ctx.node.properties.keys():
+ if "aspr_classification" in ctx.node.properties:
aspr_classification = ctx.node.properties["aspr_classification"]
else:
aspr_classification = "unclassified"
- if "useExisting" in ctx.node.properties.keys():
+ if "useExisting" in ctx.node.properties:
useExisting = ctx.node.properties["useExisting"]
else:
useExisting = False
dmc = DMaaPControllerHandle(DMAAP_API_URL, DMAAP_USER, DMAAP_PASS, ctx.logger)
ctx.logger.info("DMaaPControllerHandle() returned")
feed_id_input = False
- if "feed_id" in ctx.node.properties.keys():
+ if "feed_id" in ctx.node.properties:
feed_id_input = True
f = dmc.get_feed_info(ctx.node.properties["feed_id"])
- elif "feed_name" in ctx.node.properties.keys():
+ elif "feed_name" in ctx.node.properties:
feed_name = ctx.node.properties["feed_name"]
f = dmc.get_feed_info_by_name(feed_name)
if f is None:
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017-2019 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");
# you may not use this file except in compliance with the License.
from cloudify.decorators import operation
from cloudify.exceptions import NonRecoverableError
from dmaapplugin import DMAAP_API_URL, DMAAP_USER, DMAAP_PASS, CONSUL_HOST
-from dmaaputils import random_string
+from dmaapplugin.dmaaputils import random_string
from dmaapcontrollerif.dmaap_requests import DMaaPControllerHandle
from consulif.consulif import ConsulHandle
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017-2019 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");
# you may not use this file except in compliance with the License.
from cloudify.decorators import operation
from cloudify.exceptions import NonRecoverableError
from dmaapplugin import DMAAP_API_URL, DMAAP_USER, DMAAP_PASS, DMAAP_OWNER
-from dmaaputils import random_string
+from dmaapplugin.dmaaputils import random_string
from dmaapcontrollerif.dmaap_requests import DMaaPControllerHandle
# Lifecycle operations for DMaaP Message Router topics
<parent>
<groupId>org.onap.ccsdk.platform</groupId>
<artifactId>plugins</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<!--- CHANGE THE FOLLOWING 3 OBJECTS for your own repo -->
<artifactId>dmaap</artifactId>
<name>dmaap</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<!-- name from the setup.py file -->
-python-consul==0.7.0
+python-consul>=0.7.0
+requests
+cloudify-common>=5.0.5
+# ============LICENSE_START====================================================
+# =============================================================================
+# Copyright (c) 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");
+# 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======================================================
+
from setuptools import setup, find_packages
setup(
name = "dmaap",
- version = "1.3.5",
+ version = "1.4.0",
packages=find_packages(),
author = "AT&T",
description = ("Cloudify plugin for creating DMaaP feeds and topics, and setting up publishers and subscribers."),
keywords = "",
url = "",
zip_safe=False,
- install_requires = [
- "python-consul==0.7.0"
- ]
+ install_requires=[
+ 'python-consul>=0.7.0',
+ 'requests',
+ 'cloudify-common>=5.0.5',
+ ],
)
# org.onap.dcae
# ================================================================================
# Copyright (c) 2017-2018 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");
# you may not use this file except in compliance with the License.
DMAAP_OWNER = config['owner']
properties = {'fqdn': 'a.x.example.com', 'openstack': _goodosv2 }
- mock_ctx = MockCloudifyContext(node_id='test_node_id', node_name='test_node_name', properties=properties,
- runtime_properties = {
- "admin": { "user": "admin_user" },
- "user": { "user": "user_user" },
- "viewer": { "user": "viewer_user" }
- }
- )
+ mock_ctx = MockCloudifyContext(
+ node_id='test_node_id',
+ node_name='test_node_name',
+ properties=properties,
+ runtime_properties = {
+ "admin": { "user": "admin_user" },
+ "user": { "user": "user_user" },
+ "viewer": { "user": "viewer_user" }
+ })
current_ctx.set(mock_ctx)
# org.onap.dcae
# ================================================================================
# Copyright (c) 2017-2018 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");
# you may not use this file except in compliance with the License.
from dmaapplugin import dr_lifecycle
properties = {'fqdn': 'a.x.example.com', 'openstack': _goodosv2, 'feed_id': 'test_feed_id' }
- mock_ctx = MockCloudifyContext(node_id='test_node_id', node_name='test_node_name', properties=properties,
- runtime_properties = {
- "admin": { "user": "admin_user" },
- "user": { "user": "user_user" },
- "viewer": { "user": "viewer_user" }
- }
- )
+ mock_ctx = MockCloudifyContext(
+ node_id='test_node_id',
+ node_name='test_node_name',
+ properties=properties,
+ runtime_properties = {
+ "admin": { "user": "admin_user" },
+ "user": { "user": "user_user" },
+ "viewer": { "user": "viewer_user" }
+ })
current_ctx.set(mock_ctx)
# org.onap.dcae
# ================================================================================
# Copyright (c) 2017-2018 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");
# you may not use this file except in compliance with the License.
import dmaapplugin
from dmaapplugin import mr_lifecycle
properties = {'fqdn': 'a.x.example.com', 'openstack': _goodosv2, 'fqtn': 'test_fqtn' }
- mock_ctx = MockCloudifyContext(node_id='test_node_id', node_name='test_node_name', properties=properties,
- runtime_properties = {
- "admin": { "user": "admin_user" },
- "user": { "user": "user_user" },
- "viewer": { "user": "viewer_user" }
- }
- )
+ mock_ctx = MockCloudifyContext(
+ node_id='test_node_id',
+ node_name='test_node_name',
+ properties=properties,
+ runtime_properties = {
+ "admin": { "user": "admin_user" },
+ "user": { "user": "user_user" },
+ "viewer": { "user": "viewer_user" }
+ })
current_ctx.set(mock_ctx)
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017-2019 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");
# you may not use this file except in compliance with the License.
# ============LICENSE_END======================================================
[tox]
-envlist = py27
+envlist = py27,py36,py37
+skip_missing_interpreters = true
+
[testenv]
deps=
- requests
- cloudify==3.4
pytest
coverage
pytest-cov
+ -r requirements.txt
setenv =
PYTHONPATH={toxinidir}
commands=
dns_designate:
executor: central_deployment_agent
package_name: dnsdesig
- package_version: 1.0.0
+ package_version: 1.1.0
node_types:
ccsdk.nodes.dns.arecord:
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2018 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");
# 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.
# ============LICENSE_END======================================================
import requests
-from urlparse import urlparse
from cloudify import ctx
from cloudify.decorators import operation
from cloudify.exceptions import NonRecoverableError, RecoverableError
(tok, gbls, urls) = _get_auth_info_v2(openstack)
else:
(tok, gbls, urls) = _get_auth_info_v3(openstack)
- if len(urls.keys()) == 1:
- reg = urls.keys()[0]
+ if len(urls) == 1:
+ reg = list(urls)[0]
else:
reg = openstack['region']
if reg in urls and 'dns' in urls[reg]:
<parent>
<groupId>org.onap.ccsdk.platform</groupId>
<artifactId>plugins</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<!--- CHANGE THE FOLLOWING 3 OBJECTS for your own repo -->
<artifactId>dnsdesig</artifactId>
<name>dnsdesig</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<!-- name from the setup.py file -->
+requests
+cloudify-common>=5.0.5
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2018 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");
# 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.
setup(
name='dnsdesig',
- version='1.0.1',
+ version='1.1.0',
packages=find_packages(),
author='AT&T',
description=('Cloudify plugin for creating DNS entries using Designate.'),
zip_safe=False,
package_data={'':['LICENSE.txt']},
install_requires=[
- ]
+ 'requests',
+ 'cloudify-common>=5.0.5',
+ ],
)
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2018 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");
# you may not use this file except in compliance with the License.
'publicURL': 'https://example.com/dns',
'region': 'r'
},
- {
- 'publicURL': 'https://example.com/otherregions'
- }
+ {
+ 'publicURL': 'https://example.com/otherregions'
+ }
]
}
]
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017 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");
# you may not use this file except in compliance with the License.
# ============LICENSE_END======================================================
[tox]
-envlist = py27
+envlist = py27,py36,py37
+skip_missing_interpreters = true
+
[testenv]
deps=
- requests
- cloudify==3.4
pytest
coverage
pytest-cov
+ -r requirements.txt
setenv=
PYTHONPATH={toxinidir}
commands=
+++ /dev/null
-pyyaml==3.12
-
--e git+https://github.com/cloudify-cosmo/cloudify-dsl-parser@4.1.1-build#egg=cloudify-dsl-parser==4.1.1
--e git+https://github.com/cloudify-cosmo/cloudify-rest-client@4.1.1-build#egg=cloudify-rest-client==4.1.1
--e git+https://github.com/cloudify-cosmo/cloudify-plugins-common@4.1.1-build#egg=cloudify-plugins-common==4.1.1
-nose
helm-plugin:
executor: central_deployment_agent
package_name: helm
- package_version: 4.0.2
+ package_version: 4.1.0
node_types:
# ============LICENSE_START==========================================
# ===================================================================
# Copyright (c) 2018 AT&T
+# Copyright (c) 2020 Pantheon.tech. 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.
# limitations under the License.
# ============LICENSE_END============================================
-from cloudify.decorators import operation
import shutil
import errno
import sys
import re
import getpass
import subprocess
-from cloudify import ctx
-from cloudify.exceptions import OperationRetry
-from cloudify_rest_client.exceptions import CloudifyClientError
-import pip
import json
import base64
import yaml
-import urllib2
-from cloudify.decorators import operation
+try:
+ from urllib.request import Request, urlopen
+except ImportError:
+ from urllib2 import Request, urlopen
+
+from cloudify import ctx
from cloudify import exceptions
+from cloudify.decorators import operation
+from cloudify.exceptions import OperationRetry
from cloudify.exceptions import NonRecoverableError
+from cloudify_rest_client.exceptions import CloudifyClientError
+
def debug_log_mask_credentials(_command_str):
debug_str = _command_str
head, auth = head.rsplit('//', 1)
url = head + '//' + end
username, password = auth.rsplit(':', 1)
- request = urllib2.Request(url)
+ request = Request(url)
base64string = base64.encodestring(
'%s:%s' % (username, password)).replace('\n', '')
request.add_header("Authorization", "Basic %s" % base64string)
- response = urllib2.urlopen(request)
+ response = urlopen(request)
elif repo_user != '' and repo_user_passwd != '':
- request = urllib2.Request(url)
+ request = Request(url)
base64string = base64.b64encode('%s:%s' % (repo_user, repo_user_passwd))
request.add_header("Authorization", "Basic %s" % base64string)
- response = urllib2.urlopen(request)
+ response = urlopen(request)
else:
- response = urllib2.urlopen(url)
+ response = urlopen(url)
config_obj = {}
if f_format == 'json':
# ============LICENSE_START==========================================
# ===================================================================
# Copyright (c) 2018 AT&T
+# Copyright (c) 2020 Pantheon.tech. 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.
from cloudify.decorators import workflow
from cloudify.workflows import ctx
from cloudify.exceptions import NonRecoverableError
-import urllib2
import json
import yaml
import base64
<parent>
<groupId>org.onap.ccsdk.platform</groupId>
<artifactId>plugins</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<!--- CHANGE THE FOLLOWING 3 OBJECTS for your own repo -->
<artifactId>helm</artifactId>
<name>helm</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<!-- name from the setup.py file -->
--- /dev/null
+pyyaml>=3.12
+#cloudify-common>=5.0.5
+# The released version of cloudify-common has limited python3 support.
+#
+# This build linked from github is more complete in this regard, and
+# has at least the tests written for pgaas passing. The other plugins
+# do not seem to have tests that exercise the unconverted parts.
+#
+# The build was created from a WIP branch, but only parts of the branch
+# were merged for release 5.0.5.
+#
+# It means that while this plugin is ready for python3, all the plugins
+# will need to wait for a python3-supporting release of cloudify.
+# When such a version is released, the single requirement should suffice.
+# The install_requires in setup.py may also be uncommented then.
+cloudify-common>=5.0.5; python_version<"3"
+cloudify-common @ git+https://github.com/cloudify-cosmo/cloudify-common@cy-1374-python3#egg=cloudify-common==5.0.5; python_version>="3"
# ============LICENSE_START==========================================
# ===================================================================
# Copyright (c) 2018 AT&T
+# Copyright (c) 2020 Pantheon.tech. 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.
# Do not use underscores in the plugin name.
name='helm',
- version='4.0.2',
+ version='4.1.0',
author='Nicolas Hu(AT&T)',
author_email='jh245g@att.com',
description='This plugin will install/uninstall/upgrade/rollback helm '
license='LICENSE',
zip_safe=False,
install_requires=[
- # Necessary dependency for developing plugins, do not remove!
'pyyaml>=3.12',
- "cloudify-plugins-common>=4.1.1"
+ # The package specified by requirements would be replaced with 5.0.5.1+
+ # when this package is installed. That currently breaks on python3.
+ #'cloudify-common>=5.0.5',
],
test_requires=[
- "cloudify-dsl-parser>=4.1.1"
- "nose"
- ]
+ 'nose',
+ ],
)
-# content of: tox.ini , put in same dir as setup.py
+# ============LICENSE_START====================================================
+# =============================================================================
+# Copyright (c) 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");
+# 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======================================================
+
[tox]
-envlist=flake8,py27
+envlist = flake8,py27,py36,py37
+skip_missing_interpreters = true
[testenv:py27]
deps =
nose-cov
mock
testfixtures
- -rdev-requirements.txt
+ nose
+ -r requirements.txt
+
+[testenv:py36]
+deps =
+ coverage
+ nose-cov
+ mock
+ testfixtures
+ nose
+ -r requirements.txt
+
+[testenv:py37]
+deps =
+ coverage
+ nose-cov
+ mock
+ testfixtures
+ nose
+ -r requirements.txt
+[testenv]
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
# commands=nosetests --with-cov --cov-report term-missing --cov plugin plugin/tests
[testenv:flake8]
deps =
flake8
- -rdev-requirements.txt
+ -r requirements.txt
commands=flake8 plugin
# ============LICENSE_START====================================================
# =============================================================================
# Copyright (c) 2017-2018 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");
# you may not use this file except in compliance with the License.
from __future__ import print_function
import sys
-USING_PYTHON2 = sys.version_info[0] < 3
-
-# pylint: disable=wrong-import-position
-# pylint: disable=wrong-import-order
-# pylint: disable=import-error
-from cloudify import ctx
-from cloudify.decorators import operation
-from cloudify.exceptions import NonRecoverableError
-from cloudify.exceptions import RecoverableError
-
-# pylint: disable=wildcard-import
-if USING_PYTHON2:
- from logginginterface import debug, info, warn, error
-else:
- from .logginginterface import debug, info, warn, error
-
import os
import re
import json
import socket
import traceback
import base64
-if USING_PYTHON2:
- import urllib
-else:
- import urllib.request
- import urllib.parse
- import urllib.error
+import binascii
import collections
+try:
+ from urllib.parse import quote
+except ImportError:
+ from urllib import quote
+
+from cloudify import ctx
+from cloudify.decorators import operation
+from cloudify.exceptions import NonRecoverableError
+from cloudify.exceptions import RecoverableError
+
+try:
+ import psycopg2
+except ImportError:
+ # FIXME: any users of this plugin installing its dependencies in nonstandard
+ # directories should set up PYTHONPATH accordingly, outside the program code
+ SYSPATH = sys.path
+ sys.path = list(SYSPATH)
+ sys.path.append('/usr/lib64/python2.7/site-packages')
+ import psycopg2
+ sys.path = SYSPATH
+from pgaas.logginginterface import debug, info, warn, error
-SYSPATH = sys.path
-sys.path = list(SYSPATH)
-sys.path.append('/usr/lib64/python2.7/site-packages')
-import psycopg2
-sys.path = SYSPATH
"""
To set up a cluster:
"""
returns a safely printable version of the string
"""
- # pylint: disable=no-member
- return urllib.quote(str(s), '') if USING_PYTHON2 else urllib.parse.quote(str(s), '')
+ return quote(str(s), '')
def raiseRecoverableError(msg):
"""
with open(hostPortDbname, "a") as fp:
with open("/dev/urandom", "rb") as rp:
b = rp.read(16)
- import binascii
print(binascii.hexlify(b).decode('utf-8'), file=fp)
appended = True
if not appended:
pgaas:
executor: central_deployment_agent
package_name: pgaas
- package_version: 1.1.0
+ package_version: 1.2.0
node_types:
dcae.nodes.pgaas.cluster:
<parent>
<groupId>org.onap.ccsdk.platform</groupId>
<artifactId>plugins</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<!--- CHANGE THE FOLLOWING 3 OBJECTS for your own repo -->
<artifactId>pgaas</artifactId>
<name>pgaas</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<!-- name from the setup.py file -->
+psycopg2-binary
+cloudify-common>=5.0.5
# ============LICENSE_START====================================================
# =============================================================================
# Copyright (c) 2017-2018 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");
# 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.
setup(
name="pgaas",
- version="1.1.0",
+ version="1.2.0",
packages=find_packages(),
author="AT&T",
description=("Cloudify plugin for pgaas/pgaas."),
url="https://onap.org",
zip_safe=False,
install_requires=[
- ]
+ 'psycopg2-binary',
+ 'cloudify-common>=5.0.5',
+ ],
)
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017 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");
# you may not use this file except in compliance with the License.
# ============LICENSE_END======================================================
[tox]
-envlist = py27
-# The PGaaS plugin uses several Cloudify mock libraries, one of which
-# is not compatible with Python3.
-# Until we get an updated version of that Cloudify mock libraries,
-# we will have to leave out py3X from the tox tests.
-# We cannot use py37 yet because Jenkins returns:
-# InterpreterNotFound: python3.7
-#envlist = py27,py36
+envlist = py27,py36,py37
+skip_missing_interpreters = true
+
[testenv]
deps=
pytest
- cloudify==4.2
- requests
coverage
pytest-cov
+ -r requirements.txt
setenv=
PYTHONPATH={toxinidir}
commands=pytest --junitxml xunit-results.xml --cov --cov-report=xml
<groupId>org.onap.ccsdk.platform</groupId>
<artifactId>plugins</artifactId>
<name>ccsdk-platform-plugins</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<packaging>pom</packaging>
<modules>
<artifactId>sshkeyshare</artifactId>
<name>sshkeyshare</name>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<!-- name from the setup.py file -->
# org.onap.ccsdk
# =============================================================================
# Copyright (c) 2017 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");
# 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.
setup(
name='sshkeyshare',
- version='1.0.0',
+ version='1.1.0',
packages=find_packages(),
author='AT&T',
description=('Cloudify plugin for creating ssh keypairs on the fly.'),
zip_safe=False,
package_data={'':['LICENSE.txt']},
install_requires=[
- ]
+ 'cloudify-common>=5.0.5',
+ ],
)
ssh_keyshare:
executor: central_deployment_agent
package_name: sshkeyshare
- package_version: 1.0.0
+ package_version: 1.1.0
node_types:
ccsdk.nodes.ssh.keypair:
derived_from: cloudify.nodes.Root
# ============LICENSE_START====================================================
# =============================================================================
# Copyright (c) 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");
# you may not use this file except in compliance with the License.
# ============LICENSE_END======================================================
[tox]
-envlist = py27
+envlist = py27,py36,py37
skip_missing_interpreters = true
[testenv]
deps=
- cloudify==3.4
pytest
coverage
pytest-cov
+ -r requirements.txt
setenv=
PYTHONPATH={toxinidir}
commands=
Code Review / ccsdk / platform / plugins.git / commitdiff