diff options
| -rw-r--r--[-rwxr-xr-x] | dmaap/pom.xml | 4 | ||||
| -rw-r--r-- | dnsdesig/pom.xml | 4 | ||||
| -rw-r--r-- | helm/pom.xml | 4 | ||||
| -rw-r--r-- | pgaas/pom.xml | 4 | ||||
| -rw-r--r-- | sshkeyshare/pom.xml | 4 | ||||
| -rw-r--r-- | sshkeyshare/sshkeyshare/keyshare_plugin.py | 6 | ||||
| -rw-r--r-- | sshkeyshare/tox.ini | 19 |
7 files changed, 32 insertions, 13 deletions
diff --git a/dmaap/pom.xml b/dmaap/pom.xml index 5213d9d..f49bb8c 100755..100644 --- a/dmaap/pom.xml +++ b/dmaap/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= org.onap.ccsdk ================================================================================ -Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. +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. @@ -45,7 +45,7 @@ limitations under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <sonar.sources>.</sonar.sources> <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath> - <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath> + <sonar.python.coverage.reportPaths>coverage.xml</sonar.python.coverage.reportPaths> <sonar.language>py</sonar.language> <sonar.pluginName>Python</sonar.pluginName> <sonar.inclusions>**/*.py</sonar.inclusions> diff --git a/dnsdesig/pom.xml b/dnsdesig/pom.xml index ca8c99e..fdf5395 100644 --- a/dnsdesig/pom.xml +++ b/dnsdesig/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= org.onap.ccsdk ================================================================================ -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. @@ -45,7 +45,7 @@ limitations under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <sonar.sources>.</sonar.sources> <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath> - <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath> + <sonar.python.coverage.reportPaths>coverage.xml</sonar.python.coverage.reportPaths> <sonar.language>py</sonar.language> <sonar.pluginName>Python</sonar.pluginName> <sonar.inclusions>**/*.py</sonar.inclusions> diff --git a/helm/pom.xml b/helm/pom.xml index c135653..81df0e8 100644 --- a/helm/pom.xml +++ b/helm/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= org.onap.ccsdk ================================================================================ -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. @@ -45,7 +45,7 @@ limitations under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <sonar.sources>.</sonar.sources> <sonar.junit.reportsPath>nosetests.xml</sonar.junit.reportsPath> - <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath> + <sonar.python.coverage.reportPaths>coverage.xml</sonar.python.coverage.reportPaths> <sonar.language>py</sonar.language> <sonar.pluginName>Python</sonar.pluginName> <sonar.inclusions>**/*.py</sonar.inclusions> diff --git a/pgaas/pom.xml b/pgaas/pom.xml index ab03d6f..6db8454 100644 --- a/pgaas/pom.xml +++ b/pgaas/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= org.onap.ccsdk ================================================================================ -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. @@ -45,7 +45,7 @@ limitations under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <sonar.sources>.</sonar.sources> <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath> - <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath> + <sonar.python.coverage.reportPaths>coverage.xml</sonar.python.coverage.reportPaths> <sonar.language>py</sonar.language> <sonar.pluginName>Python</sonar.pluginName> <sonar.inclusions>**/*.py</sonar.inclusions> diff --git a/sshkeyshare/pom.xml b/sshkeyshare/pom.xml index ee382d6..759d57c 100644 --- a/sshkeyshare/pom.xml +++ b/sshkeyshare/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= org.onap.ccsdk ================================================================================ -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. @@ -45,7 +45,7 @@ limitations under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <sonar.sources>.</sonar.sources> <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath> - <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath> + <sonar.python.coverage.reportPaths>coverage.xml</sonar.python.coverage.reportPaths> <sonar.language>py</sonar.language> <sonar.pluginName>Python</sonar.pluginName> <sonar.inclusions>**/*.py</sonar.inclusions> diff --git a/sshkeyshare/sshkeyshare/keyshare_plugin.py b/sshkeyshare/sshkeyshare/keyshare_plugin.py index 7358efd..eb2a059 100644 --- a/sshkeyshare/sshkeyshare/keyshare_plugin.py +++ b/sshkeyshare/sshkeyshare/keyshare_plugin.py @@ -1,7 +1,7 @@ # ============LICENSE_START==================================================== # org.onap.ccsdk # ============================================================================= -# 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. @@ -21,13 +21,13 @@ import os from cloudify import ctx from cloudify.decorators import operation -@operation +@operation(resumable=True) def generate(**kwargs): """ Create SSH key pair """ tmpdir = '/tmp/{0}'.format(uuid.uuid4().hex) - os.mkdir(tmpdir, 0700) + os.mkdir(tmpdir, 0o700) os.system('ssh-keygen -t rsa -b 2048 -C "hadoop@cdapcluster" -N "" -f {0}/id_rsa'.format(tmpdir)) os.system('base64 -w 0 <{0}/id_rsa >{0}/id64'.format(tmpdir)) with open('{0}/id64'.format(tmpdir), 'r') as f: diff --git a/sshkeyshare/tox.ini b/sshkeyshare/tox.ini index 29b7a45..e2aff1e 100644 --- a/sshkeyshare/tox.ini +++ b/sshkeyshare/tox.ini @@ -1,5 +1,24 @@ +# ============LICENSE_START==================================================== +# ============================================================================= +# Copyright (c) 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====================================================== + [tox] envlist = py27 +skip_missing_interpreters = true + [testenv] deps= cloudify==3.4 |