summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam <kanagaraj.manickam@huawei.com>2019-09-04 07:47:09 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-04 07:47:09 +0000
commitbdb0190c7d3abb3a02bc5fdd9a408bda71186c4f (patch)
treed1aabba022ce8cf34bd13fc0d17692872b58e9e5
parentb58675ffa633826ab77d53f1af8006a844ed8924 (diff)
parent1c14f9cd1b4557815ea1550815454ba34011f6e4 (diff)
Merge "Add windows support"
-rw-r--r--.gitignore1
-rw-r--r--deployment/zip/src/main/release/bin/oclip-grpc-server.cmd39
-rw-r--r--deployment/zip/src/main/release/bin/oclip-grpc-server.sh2
-rw-r--r--deployment/zip/src/main/release/bin/oclip.cmd39
-rwxr-xr-xdeployment/zip/src/main/release/bin/oclip.sh2
-rw-r--r--products/onap-dublin/features/integration/src/main/resources/script/vnf-tosca-provision.py2
6 files changed, 83 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 1011c3b3..bdf19c11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-bin/
target/
coverage-report/
data/
diff --git a/deployment/zip/src/main/release/bin/oclip-grpc-server.cmd b/deployment/zip/src/main/release/bin/oclip-grpc-server.cmd
new file mode 100644
index 00000000..239e777e
--- /dev/null
+++ b/deployment/zip/src/main/release/bin/oclip-grpc-server.cmd
@@ -0,0 +1,39 @@
+@echo off
+REM #*******************************************************************************
+REM # Copyright 2017 Huawei Technologies Co., Ltd.
+REM #
+REM # Licensed under the Apache License, Version 2.0 (the "License");
+REM # you may not use this file except in compliance with the License.
+REM # You may obtain a copy of the License at
+REM #
+REM # http://www.apache.org/licenses/LICENSE-2.0
+REM #
+REM # Unless required by applicable law or agreed to in writing, software
+REM # distributed under the License is distributed on an "AS IS" BASIS,
+REM # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM # See the License for the specific language governing permissions and
+REM # limitations under the License.
+REM #*******************************************************************************
+
+if "%OPEN_CLI_HOME%"=="" (
+ echo "OPEN_CLI_HOME is not set."
+ exit 1
+)
+
+if "%OPEN_CLI_DEBUG_PORT%"=="" (
+ set OPEN_CLI_DEBUG_PORT=5005
+)
+
+set CLASSPATH=%OPEN_CLI_HOME%\conf;%OPEN_CLI_HOME%\docs;%OPEN_CLI_HOME%;%OPEN_CLI_HOME%\lib\*
+set PATH=%OPEN_CLI_HOME%\bin;%PATH%
+
+::SETLOCAL EnableDelayedExpansion
+::for /f %%e in ('dir /b %OPEN_CLI_HOME%\lib') do (
+:: set "CLASSPATH=!CLASSPATH!;%OPEN_CLI_HOME%\lib\%%e"
+::)
+
+if "%OPEN_CLI_DEBUG%"=="true" (
+ java -Xdebug -Xrunjdwp:transport=dt_socket,address=%OPEN_CLI_DEBUG_PORT%,server=y -classpath %CLASSPATH% -DOPEN_CLI_HOME=%OPEN_CLI_HOME% org.open.infc.grpc.server.OpenInterfaceGrpcServer %*
+) else (
+ java -classpath %CLASSPATH% -DOPEN_CLI_HOME=%OPEN_CLI_HOME% org.open.infc.grpc.server.OpenInterfaceGrpcServer %*
+)
diff --git a/deployment/zip/src/main/release/bin/oclip-grpc-server.sh b/deployment/zip/src/main/release/bin/oclip-grpc-server.sh
index 12b0a1ef..ea6ecb7c 100644
--- a/deployment/zip/src/main/release/bin/oclip-grpc-server.sh
+++ b/deployment/zip/src/main/release/bin/oclip-grpc-server.sh
@@ -30,6 +30,8 @@ else
fi
CLASSPATH=${OPEN_CLI_HOME}/conf${SEP}${OPEN_CLI_HOME}${SEP}${OPEN_CLI_HOME}/docs
+export PATH=$OPEN_CLI_HOME\bin;$PATH
+
for entry in "$OPEN_CLI_HOME/lib"/*
do
CLASSPATH=${CLASSPATH}${SEP}${entry}
diff --git a/deployment/zip/src/main/release/bin/oclip.cmd b/deployment/zip/src/main/release/bin/oclip.cmd
new file mode 100644
index 00000000..2648d40a
--- /dev/null
+++ b/deployment/zip/src/main/release/bin/oclip.cmd
@@ -0,0 +1,39 @@
+@echo off
+REM #*******************************************************************************
+REM # Copyright 2017 Huawei Technologies Co., Ltd.
+REM #
+REM # Licensed under the Apache License, Version 2.0 (the "License");
+REM # you may not use this file except in compliance with the License.
+REM # You may obtain a copy of the License at
+REM #
+REM # http://www.apache.org/licenses/LICENSE-2.0
+REM #
+REM # Unless required by applicable law or agreed to in writing, software
+REM # distributed under the License is distributed on an "AS IS" BASIS,
+REM # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM # See the License for the specific language governing permissions and
+REM # limitations under the License.
+REM #*******************************************************************************
+
+if "%OPEN_CLI_HOME%"=="" (
+ echo "OPEN_CLI_HOME is not set."
+ exit 1
+)
+
+if "%OPEN_CLI_DEBUG_PORT%"=="" (
+ set OPEN_CLI_DEBUG_PORT=5005
+)
+
+set CLASSPATH=%OPEN_CLI_HOME%\conf;%OPEN_CLI_HOME%\docs;%OPEN_CLI_HOME%;%OPEN_CLI_HOME%\lib\*
+set PATH=%OPEN_CLI_HOME%\bin;%PATH%
+
+::SETLOCAL EnableDelayedExpansion
+::for /f %%e in ('dir /b %OPEN_CLI_HOME%\lib') do (
+:: set "CLASSPATH=!CLASSPATH!;%OPEN_CLI_HOME%\lib\%%e"
+::)
+
+if "%OPEN_CLI_DEBUG%"=="true" (
+ java -Xdebug -Xrunjdwp:transport=dt_socket,address=%OPEN_CLI_DEBUG_PORT%,server=y -classpath %CLASSPATH% -DOPEN_CLI_HOME=%OPEN_CLI_HOME% org.onap.cli.main.OnapCli %*
+) else (
+ java -classpath %CLASSPATH% -DOPEN_CLI_HOME=%OPEN_CLI_HOME% org.onap.cli.main.OnapCli %*
+)
diff --git a/deployment/zip/src/main/release/bin/oclip.sh b/deployment/zip/src/main/release/bin/oclip.sh
index a841c926..547daf18 100755
--- a/deployment/zip/src/main/release/bin/oclip.sh
+++ b/deployment/zip/src/main/release/bin/oclip.sh
@@ -30,6 +30,8 @@ else
fi
CLASSPATH=${OPEN_CLI_HOME}/conf${SEP}${OPEN_CLI_HOME}${SEP}${OPEN_CLI_HOME}/docs
+export PATH=$OPEN_CLI_HOME\bin;$PATH
+
for entry in "$OPEN_CLI_HOME/lib"/*
do
CLASSPATH=${CLASSPATH}${SEP}${entry}
diff --git a/products/onap-dublin/features/integration/src/main/resources/script/vnf-tosca-provision.py b/products/onap-dublin/features/integration/src/main/resources/script/vnf-tosca-provision.py
index 0dd7ab5b..c624d4fb 100644
--- a/products/onap-dublin/features/integration/src/main/resources/script/vnf-tosca-provision.py
+++ b/products/onap-dublin/features/integration/src/main/resources/script/vnf-tosca-provision.py
@@ -711,7 +711,7 @@ if __name__ == '__main__':
onap.create_vsp()
onap.create_vf_model()
onap.create_service_model()
-# onap.create_vnf()
+ onap.create_vnf()
onap.vnf_status_check()
def _cleanup():