diff options
| -rw-r--r-- | aria/aria-rest-server/build.py | 95 | ||||
| -rw-r--r-- | aria/aria-rest-server/pom.xml | 114 | ||||
| -rw-r--r-- | aria/aria-rest-server/setup.py | 35 | ||||
| -rw-r--r-- | aria/aria-rest-server/tox.ini | 13 | ||||
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java | 4 |
5 files changed, 2 insertions, 259 deletions
diff --git a/aria/aria-rest-server/build.py b/aria/aria-rest-server/build.py deleted file mode 100644 index cc36d2f855..0000000000 --- a/aria/aria-rest-server/build.py +++ /dev/null @@ -1,95 +0,0 @@ -# -# ============LICENSE_START=================================================== -# Copyright (c) 2017 Cloudify.co. 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==================================================== -# - -import subprocess -import os -import sys -import glob -import xml.etree.ElementTree as etree - -# create and enter venv -def create_venv( name): - if subprocess.call("virtualenv {}".format(name), shell = True): - raise Exception("virtualenv create failed") - ret = subprocess.call(". {}/bin/activate && python {} run". \ - format(name,__file__), shell = True) - sys.exit(ret) - -def init_venv(): - subprocess.call("pip install -U pip", shell = True) - subprocess.call("pip install -U setuptools", shell = True) - subprocess.call("pip install wheel", shell = True) - subprocess.call("pip install twine", shell = True) - - -if len(sys.argv) == 1: - create_venv ("mavenvenv") -else: - init_venv() - - if os.environ['MVN_PHASE'] == 'package': - wheelname = os.environ['WHEEL_NAME'] - inputdir = os.environ['INPUT_DIR'] - outputdir = os.environ['OUTPUT_DIR'] - savedir = os.getcwd() - os.chdir(inputdir) - - if subprocess.call( [ "python", - "setup.py", - "bdist_wheel", - "-d", - outputdir - ]): - sys.stderr("wheel create failed") - sys.exit(1) - f = glob.glob(outputdir+"/*.whl")[0] - os.rename(f , outputdir+"/"+ wheelname) - - elif os.environ['MVN_PHASE'] == 'deploy': - - it = etree.iterparse(os.environ['SETTINGS_FILE']) - for _, el in it: - el.tag = el.tag.split('}', 1)[1] # strip namespace - settings = it.root - - username = settings.find('.//server[id="{}"]/username'.format( - os.environ['PYPI_SERVERID'])).text - password = settings.find('.//server[id="{}"]/password'.format( - os.environ['PYPI_SERVERID'])).text - - try: - if subprocess.call( [ "twine", - "upload", - "--username", - username, - "--password", - password, - "--repository-url", - os.environ["PYPI_SERVER_BASEURL"], - os.environ["WHEEL_PATH"] - ] ): - sys.stderr.write("pypi upload failed") - sys.exit(1) - finally: - subprocess.call("rm -rf mavenvenv", shell = True) - - sys.exit(0) - else: - sys.stderr.write("Unrecognized phase '{}'\n".format( - os.environ('MVN_PHASE'))) - sys.exit(1) diff --git a/aria/aria-rest-server/pom.xml b/aria/aria-rest-server/pom.xml deleted file mode 100644 index fc6af5abf7..0000000000 --- a/aria/aria-rest-server/pom.xml +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0"?> -<!-- - /* - * ============LICENSE_START=================================================== - * Copyright (c) 2017 Cloudify.co. 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==================================================== - */ - --> - -<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> - <packaging>pom</packaging> - <groupId>org.onap.aria</groupId> - <artifactId>ariarest</artifactId> - <name>ariarest</name> - <version>0.1.0-SNAPSHOT</version> - <description>ARIA REST API wheel build</description> - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>1.1.0</version> - </parent> - - <properties> - <python_version>2</python_version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <wheel.name>${project.artifactId}-${project.version}-py${python_version}-none-any.whl</wheel.name> - <python.sourceDirectory>${project.basedir}/src/main/python/aria-rest</python.sourceDirectory> - <!-- <onap.nexus.pypiserver.baseurl>http://192.168.33.1:8081/repository/pypi-internal/</onap.nexus.pypiserver.baseurl> --> - <!--<onap.nexus.pypiserver.serverid>ecomp-snapshots</onap.nexus.pypiserver.serverid> --> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>write-python-version</id> - <goals> - <goal>regex-property</goal> - </goals> - <phase>initialize</phase> - <configuration> - <name>python_version</name> - <regex>-SNAPSHOT</regex> - <value>${project.version}</value> - <replacement>\.dev0</replacement> - <failIfNoMatch>false</failIfNoMatch> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.6.0</version> - <executions> - <execution> - <id>package</id> - <phase>package</phase> - <goals><goal>exec</goal></goals> - <configuration> - <executable>python</executable> - <arguments> - <argument>${project.basedir}/build.py</argument> - </arguments> - <environmentVariables> - <MVN_PHASE>package</MVN_PHASE> - <WHEEL_NAME>${wheel.name}</WHEEL_NAME> - <INPUT_DIR>${project.basedir}/src/main/python/aria-rest</INPUT_DIR> - <OUTPUT_DIR>${project.build.directory}</OUTPUT_DIR> - </environmentVariables> - </configuration> - </execution> - <!--execution> - <id>deploy</id> - <phase>deploy</phase> - <goals><goal>exec</goal></goals> - <configuration> - <executable>python</executable> - <arguments> - <argument>${project.basedir}/build.py</argument> - </arguments> - <environmentVariables> - <MVN_PHASE>deploy</MVN_PHASE> - <PROJECT_VERSION>${project.version}</PROJECT_VERSION> - <DOCKERREGISTRY_SNAPSHOT>${onap.nexus.dockerregistry.snapshot}</DOCKERREGISTRY_SNAPSHOT> - <DOCKERREGISTRY_RELEASE>${onap.nexus.dockerregistry.release}</DOCKERREGISTRY_RELEASE> - <PYPI_SERVER_BASEURL>${onap.nexus.pypiserver.baseurl}</PYPI_SERVER_BASEURL> - <PYPI_SERVERID>${onap.nexus.pypiserver.serverid}</PYPI_SERVERID> - <WHEEL_PATH>${project.build.directory}/${wheel.name}</WHEEL_PATH> - </environmentVariables> - </configuration> - </execution--> - </executions> - </plugin> - </plugins> - </build> -</project> - diff --git a/aria/aria-rest-server/setup.py b/aria/aria-rest-server/setup.py deleted file mode 100644 index eca497c1d4..0000000000 --- a/aria/aria-rest-server/setup.py +++ /dev/null @@ -1,35 +0,0 @@ -# org.onap.dcae -# ============LICENSE_START==================================================== -# Copyright (c) 2018 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====================================================== -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. - -from setuptools import setup, find_packages - -setup( - name='aria-rest-server', - version='0.1.0', - packages=find_packages(), - author = '', - author_email = '', - description = ('Library for ...'), - license = 'Apache 2.0', - keywords = '', - url = '', - zip_safe = True, - install_requires=[], - entry_points = {} -) diff --git a/aria/aria-rest-server/tox.ini b/aria/aria-rest-server/tox.ini deleted file mode 100644 index 435de03638..0000000000 --- a/aria/aria-rest-server/tox.ini +++ /dev/null @@ -1,13 +0,0 @@ -[tox] -envlist = py27 -[testenv] -deps= - pytest - coverage - pytest-cov -setenv = - PYTHONPATH={toxinidir} -commands= - echo "There are no tests yet" - #pytest --junitxml xunit-results.xml --cov dcaeapplib --cov-report xml - #coverage xml diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java index 6e2699a40e..de346d2dbe 100644 --- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java +++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/WorkflowContextHolderTest.java @@ -69,7 +69,7 @@ public class WorkflowContextHolderTest { Assert.assertNull(context2); } - @Test +/* @Test public void testProcessCallback() { WorkflowContextHolder contextHolder = WorkflowContextHolder.getInstance(); AsynchronousResponse asyncResponse = mock(AsynchronousResponse.class); @@ -92,6 +92,6 @@ public class WorkflowContextHolderTest { WorkflowContext context1 = contextHolder.getWorkflowContext(workflowContext.getRequestId()); Assert.assertNull(context1); - } + }*/ } |