From: DR695H Date: Thu, 18 Apr 2019 14:56:38 +0000 (-0400) Subject: move robotframeworkonap to subdirectory X-Git-Tag: 4.0.0-ONAP~9 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d050b58d3fde6a049104d8287f8d8cfbe3013d5d;p=testsuite%2Fpython-testing-utils.git move robotframeworkonap to subdirectory i also moved the build to maven based, although that isnt needed to work right now. Change-Id: Ib18d70e3ea4858cc4b9d51fdc2046b59202640ab Issue-ID: TEST-141 Signed-off-by: DR695H Signed-off-by: Gary Wu --- diff --git a/README.TXT b/README.TXT index e25739f..41a87ab 100644 --- a/README.TXT +++ b/README.TXT @@ -1,8 +1,6 @@ -OpenECOMP ETE Utils +Python Testing Utils ======================= - - Scripts written to be used during ete testing -to install locally, checkout this repo and then run 'pip install -e .' in the root \ No newline at end of file +to install locally, checkout this repo and then run 'pip install -e .' in the subdirectory of the project you want to install \ No newline at end of file diff --git a/pom.xml b/pom.xml index b196873..ecb6d7f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,78 +5,10 @@ org.onap.testsuite python-testing-utils testsuite-python-testing-utils - 0.3.0-SNAPSHOT - Scripts written to be used during robot framework testing - - org.onap.oparent - oparent-python - 1.2.3 - - - ${project.artifactId}-${python_version}-py2-none-any.whl - ${project.basedir} - https://nexus3.onap.org/repository/PyPi.snapshot/ - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - - - ${project.build.directory}/maven-python/dist/${wheel.name} - whl - - - false - - - - - - com.github.UltimateDogg - maven-python-distribute-plugin - - - package - - package - - - - process - - process-sources - - - - deploy - - deploy - - - - - ${python.pypi.repository} - ${python.sourceDirectory} - - - - exec-maven-plugin - org.codehaus.mojo - - - tox-test - - ${project.build.directory}/maven-python/eteutils - - - - - - + 0.4.0-SNAPSHOT + parent project for scripts written to be used during robot framework testing + + + robotframework-onap + \ No newline at end of file diff --git a/robotframework-onap/.gitignore b/robotframework-onap/.gitignore new file mode 100644 index 0000000..70a57dd --- /dev/null +++ b/robotframework-onap/.gitignore @@ -0,0 +1,262 @@ +.tox/* +python_openecomp_eteutils.egg-info/* + +# Created by https://www.gitignore.io/api/node,sonar,maven,eclipse,sonarqube,intellij+all + +### Eclipse ### + +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +### Eclipse Patch ### +# Eclipse Core +.project + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Annotation Processing +.apt_generated + +.sts4-cache/ + +### Intellij+all ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/modules.xml +# .idea/*.iml +# .idea/modules + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij+all Patch ### +# Ignores the whole .idea folder and all .iml files +# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 + +.idea/ + +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + +*.iml +modules.xml +.idea/misc.xml +*.ipr + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar + +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# TypeScript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + +# parcel-bundler cache (https://parceljs.org/) +.cache + +# next.js build output +.next + +# nuxt.js build output +.nuxt + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless + +### Sonar ### +#Sonar generated dir +/.sonar/ + +### SonarQube ### +# SonarQube ignore files. +# +# https://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner +# Sonar Scanner working directories +.sonar/ +.scannerwork/ + +# http://www.sonarlint.org/commandline/ +# SonarLint working directories, configuration files (including credentials) +.sonarlint/ + + +# End of https://www.gitignore.io/api/node,sonar,maven,eclipse,sonarqube,intellij+all +.flattened-pom.xml \ No newline at end of file diff --git a/robotframework-onap/README.TXT b/robotframework-onap/README.TXT new file mode 100644 index 0000000..9989546 --- /dev/null +++ b/robotframework-onap/README.TXT @@ -0,0 +1,6 @@ +Robotframework-ONAP +======================= + +Robot framework plugin to work with onap + +to install locally, checkout this repo and then run 'pip install -e .' in the root \ No newline at end of file diff --git a/eteutils/DNSUtils.py b/robotframework-onap/eteutils/DNSUtils.py similarity index 100% rename from eteutils/DNSUtils.py rename to robotframework-onap/eteutils/DNSUtils.py diff --git a/eteutils/EteGatherDataListener.py b/robotframework-onap/eteutils/EteGatherDataListener.py similarity index 100% rename from eteutils/EteGatherDataListener.py rename to robotframework-onap/eteutils/EteGatherDataListener.py diff --git a/eteutils/HEATUtils.py b/robotframework-onap/eteutils/HEATUtils.py similarity index 100% rename from eteutils/HEATUtils.py rename to robotframework-onap/eteutils/HEATUtils.py diff --git a/eteutils/HTTPUtils.py b/robotframework-onap/eteutils/HTTPUtils.py similarity index 100% rename from eteutils/HTTPUtils.py rename to robotframework-onap/eteutils/HTTPUtils.py diff --git a/eteutils/JSONUtils.py b/robotframework-onap/eteutils/JSONUtils.py similarity index 100% rename from eteutils/JSONUtils.py rename to robotframework-onap/eteutils/JSONUtils.py diff --git a/eteutils/OSUtils.py b/robotframework-onap/eteutils/OSUtils.py similarity index 100% rename from eteutils/OSUtils.py rename to robotframework-onap/eteutils/OSUtils.py diff --git a/eteutils/OpenstackLibrary.py b/robotframework-onap/eteutils/OpenstackLibrary.py similarity index 100% rename from eteutils/OpenstackLibrary.py rename to robotframework-onap/eteutils/OpenstackLibrary.py diff --git a/eteutils/RequestsClientCert.py b/robotframework-onap/eteutils/RequestsClientCert.py similarity index 100% rename from eteutils/RequestsClientCert.py rename to robotframework-onap/eteutils/RequestsClientCert.py diff --git a/eteutils/StringTemplater.py b/robotframework-onap/eteutils/StringTemplater.py similarity index 100% rename from eteutils/StringTemplater.py rename to robotframework-onap/eteutils/StringTemplater.py diff --git a/eteutils/TemplatingEngine.py b/robotframework-onap/eteutils/TemplatingEngine.py similarity index 100% rename from eteutils/TemplatingEngine.py rename to robotframework-onap/eteutils/TemplatingEngine.py diff --git a/eteutils/UUID.py b/robotframework-onap/eteutils/UUID.py similarity index 100% rename from eteutils/UUID.py rename to robotframework-onap/eteutils/UUID.py diff --git a/loadtest/__init__.py b/robotframework-onap/eteutils/__init__.py similarity index 100% rename from loadtest/__init__.py rename to robotframework-onap/eteutils/__init__.py diff --git a/eteutils/csvLibrary.py b/robotframework-onap/eteutils/csvLibrary.py similarity index 100% rename from eteutils/csvLibrary.py rename to robotframework-onap/eteutils/csvLibrary.py diff --git a/loadtest/RunEte.py b/robotframework-onap/loadtest/RunEte.py similarity index 100% rename from loadtest/RunEte.py rename to robotframework-onap/loadtest/RunEte.py diff --git a/loadtest/TestConfig.py b/robotframework-onap/loadtest/TestConfig.py similarity index 100% rename from loadtest/TestConfig.py rename to robotframework-onap/loadtest/TestConfig.py diff --git a/loadtest/TestController.py b/robotframework-onap/loadtest/TestController.py similarity index 100% rename from loadtest/TestController.py rename to robotframework-onap/loadtest/TestController.py diff --git a/loadtest/TestMain.py b/robotframework-onap/loadtest/TestMain.py similarity index 100% rename from loadtest/TestMain.py rename to robotframework-onap/loadtest/TestMain.py diff --git a/robotframework-onap/loadtest/__init__.py b/robotframework-onap/loadtest/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/robotframework-onap/pom.xml b/robotframework-onap/pom.xml new file mode 100644 index 0000000..8c6c05b --- /dev/null +++ b/robotframework-onap/pom.xml @@ -0,0 +1,85 @@ + + + 4.0.0 + pom + org.onap.testsuite.python-testing-utils + robotframework-onap + robotframework-onap + 0.4.0-SNAPSHOT + Scripts written to be used during robot framework testing + + org.onap.oparent + oparent-python + 1.2.3 + + + + + robotframework_onap-${python_version}-py2-none-any.whl + ${project.basedir} + https://nexus3.onap.org/repository/PyPi.snapshot/ + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + + + ${project.build.directory}/maven-python/dist/${wheel.name} + whl + + + false + + + + + + com.github.UltimateDogg + maven-python-distribute-plugin + + + package + + package + + + + process + + process-sources + + + + deploy + + deploy + + + + + ${python.pypi.repository} + ${python.sourceDirectory} + + + + exec-maven-plugin + org.codehaus.mojo + + + tox-test + + ${project.build.directory} + + + + + + + diff --git a/robotframework-onap/setup-template.py b/robotframework-onap/setup-template.py new file mode 100644 index 0000000..e8d3dcf --- /dev/null +++ b/robotframework-onap/setup-template.py @@ -0,0 +1,48 @@ +# Copyright 2019 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. + + +from setuptools import setup + +setup( + name='${PROJECT_NAME}', # This is the name of your PyPI-package. + keywords=("utils", "robotframework", "testing", "onap"), + version='${VERSION}', # Update the version number for new releases + license="Apache 2.0", + description='Scripts written to be used during robot framework testing', # Info about script + long_description="python-package that provides convenience methods to make certain tasks in robot framework easier." + "since this uses robot framework internal libraries or may in the future, it is not meant as a" + "general purpose library", + url="https://github.com/onap/testsuite-python-testing-utils", + platforms=['all'], + install_requires=[ + 'dnspython', + 'paramiko', + 'pyyaml', + 'robotframework', + 'deepdiff>=2.5,<3.3', + 'Jinja2' + ], # what we need + packages=['eteutils', 'loadtest', 'vcpeutils'], # The name of your scripts package + package_dir={'eteutils': 'eteutils', 'loadtest': 'loadtest', 'vcpeutils':'vcpeutils'}, # The location of your scipts package + classifiers=[ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', + 'Programming Language :: Python :: 2.7', + 'Environment :: Plugins', + 'Framework :: Robot Framework', + 'Framework :: Robot Framework :: Library', + 'License :: OSI Approved :: Apache Software License' + ] +) diff --git a/setup.cfg b/robotframework-onap/setup.cfg similarity index 100% rename from setup.cfg rename to robotframework-onap/setup.cfg diff --git a/setup.py b/robotframework-onap/setup.py similarity index 92% rename from setup.py rename to robotframework-onap/setup.py index 20aec53..c5460de 100644 --- a/setup.py +++ b/robotframework-onap/setup.py @@ -16,9 +16,9 @@ from setuptools import setup setup( - name='python-openecomp-eteutils', # This is the name of your PyPI-package. + name='robotframework-onap', # This is the name of your PyPI-package. keywords=("utils", "robotframework", "testing", "onap"), - version='0.3', # Update the version number for new releases + version='0.4', # Update the version number for new releases license="Apache 2.0", description='Scripts written to be used during robot framework testing', # Info about script long_description="python-package that provides convenience methods to make certain tasks in robot framework easier." diff --git a/tox.ini b/robotframework-onap/tox.ini similarity index 100% rename from tox.ini rename to robotframework-onap/tox.ini diff --git a/vcpeutils/SoUtils.py b/robotframework-onap/vcpeutils/SoUtils.py similarity index 100% rename from vcpeutils/SoUtils.py rename to robotframework-onap/vcpeutils/SoUtils.py diff --git a/robotframework-onap/vcpeutils/__init__.py b/robotframework-onap/vcpeutils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/vcpeutils/csar_parser.py b/robotframework-onap/vcpeutils/csar_parser.py similarity index 100% rename from vcpeutils/csar_parser.py rename to robotframework-onap/vcpeutils/csar_parser.py diff --git a/vcpeutils/preload.py b/robotframework-onap/vcpeutils/preload.py similarity index 100% rename from vcpeutils/preload.py rename to robotframework-onap/vcpeutils/preload.py diff --git a/vcpeutils/vcpecommon.py b/robotframework-onap/vcpeutils/vcpecommon.py similarity index 100% rename from vcpeutils/vcpecommon.py rename to robotframework-onap/vcpeutils/vcpecommon.py