Adding an autostart in Docker

Issue-ID: OPTFRA-22
Change-Id: I6b5e072d48d312e86cd681908e62b71059774093
Signed-off-by: Sastry Isukapalli <sastry@research.att.com>

6 files changed, 125 insertions, 30 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c703332..6c73196 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -47,3 +47,5 @@ ENV PATH /mz-dist:$PATH
 # OSDF
 RUN git clone http://gerrit.onap.org/r/optf/osdf \
     && pip install --no-cache-dir -r osdf/requirements.txt
+
+CMD [ "/osdf/osdfapp.sh" ]
diff --git a/osdf/config/base.py b/osdf/config/base.py
index b8aacff..29376a5 100644
--- a/osdf/config/base.py
+++ b/osdf/config/base.py
@@ -23,7 +23,7 @@ import osdf.config.credentials as creds
 from osdf.utils.programming_utils import DotDict
 
 config_spec = {
-    "deployment": os.environ.get("OSDF_MANAGER_CONFIG_FILE", "config/osdf_config.yaml"),
+    "deployment": os.environ.get("OSDF_CONFIG_FILE", "config/osdf_config.yaml"),
     "core": "config/common_config.yaml"
     }
 
diff --git a/osdfapp.sh b/osdfapp.sh
index c54d59c..15251a6 100755
--- a/osdfapp.sh
+++ b/osdfapp.sh
@@ -18,36 +18,14 @@
 # -------------------------------------------------------------------------
 #
 
-# Call osdf app after setting LD_LIBRARY_PATH for oracle client, postgres client, etc.
-
 cd $(dirname $0)
 
-# Environment variables below are for ORACLE_HOME and such things, and not needed for 1707 onwards
-# . ../dependencies/env.sh
-
-bash ../etc/make-certs.sh  # create the https certificates if they are not present
-
-set -e
-
-mkdir -p logs
-
-if [ ! -e "osdf-optim" ]; then
-(
-  mkdir tmp
-  cd tmp
-  tar xzf ../../dependencies/SNIROOptimizationPack.tgz
-  mv osdf ../osdf-optim
-  cd ../osdf-optim/pywheels
-  pip install docopt* jsonschema*
-)
-cp etc/run-case-local.sh osdf-optim/run/
-fi
+# bash ../etc/make-certs.sh  # create the https certificates if they are not present
 
-if [ $# -ge 1 ]; then
-   export SNIRO_MANAGER_CONFIG_FILE="$1"  # this file is passed by the DCAE controller
-fi
+LOGS=logs
+mkdir -p $LOGS
 
-# export FLASK_APP=osdfapp.py
+export OSDF_CONFIG_FILE=${1:-/opt/app/osdf_config.yaml}  # this file may be passed by invoker
+[ ! -e "$OSDF_CONFIG_FILE" ] && unset OSDF_CONFIG_FILE
 
-# flask run
-python osdfapp.py # running the app 
+python osdfapp.py 2>$LOGS/err.log 1>$LOGS/out.log < /dev/null & # running the app 
diff --git a/test/osdf/utils/test_interfaces.py b/test/osdf/utils/test_interfaces.py
new file mode 100644
index 0000000..cdb3d7a
--- /dev/null
+++ b/test/osdf/utils/test_interfaces.py
@@ -0,0 +1,69 @@
+# -------------------------------------------------------------------------
+#   Copyright (c) 2017-2018 AT&T Intellectual Property
+#
+#   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.
+#
+# -------------------------------------------------------------------------
+#
+import requests
+import unittest
+
+from requests.models import Response
+from osdf.utils.interfaces import RestClient, get_rest_client
+from unittest.mock import patch
+
+
+m1 = Response()
+m1._content = b'{"msg": "OK"}'
+m1.status_code = 202
+mock_good_response = m1
+
+m2 = Response()
+m2._content = b'{"msg": "Not-OK"}'
+m2.status_code = 403
+mock_bad_response = m2
+
+
+class TestOsdfUtilsInterfaces(unittest.TestCase):
+    @patch('requests.request', return_value=mock_good_response)
+    def test_rc_request(self, mock_good_response):
+        rc = RestClient()
+        rc.add_headers({})
+        rc.request(req_id="testReq")
+
+    @patch('requests.request', return_value=mock_good_response)
+    def test_rc_request_v1(self, mock_good_response):
+        rc = RestClient()
+        rc.add_headers({})
+        rc.request(url="http://localhost", asjson=False, log_func=lambda x: None)
+        rc.request(url="http://localhost", raw_response=True)
+        rc.request(url="http://localhost", no_response=True)
+
+    @patch('requests.request', return_value=mock_bad_response)
+    def test_rc_request_v2(self, mock_bad_response):
+        rc = RestClient()
+        try:
+            rc.request()
+        except requests.RequestException:
+            return
+        raise Exception("Allows bad requests instead of raising exception")
+
+    def test_get_rest_client(self):
+        request_json = {"requestInfo": {"callbackUrl": "http://localhost"}}
+        service = "so"
+        get_rest_client(request_json, service)
+
+
+if __name__ == "__main__":
+    unittest.main()
+
diff --git a/test/osdf/utils/test_programming_utils.py b/test/osdf/utils/test_programming_utils.py
new file mode 100644
index 0000000..2cda061
--- /dev/null
+++ b/test/osdf/utils/test_programming_utils.py
@@ -0,0 +1,46 @@
+# -------------------------------------------------------------------------
+#   Copyright (c) 2018 AT&T Intellectual Property
+#
+#   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.
+#
+# -------------------------------------------------------------------------
+#
+import unittest
+
+from osdf.utils import programming_utils as putil
+
+
+class TestProgrammingUtils(unittest.TestCase):
+
+    def test_namedtuple_with_defaults_list(self):
+        MyType1 = putil.namedtuple_with_defaults('MyType1', 'afield bfield', ['a', 'b'])
+        res = MyType1()
+        assert res.afield == 'a'
+
+    def test_namedtuple_with_defaults_dict(self):
+        MyType2 = putil.namedtuple_with_defaults('MyType2', 'afield bfield', {'afield': 'x', 'bfield': 'y'})
+        res = MyType2()
+        assert res.afield == 'x'
+        res = MyType2('blah')
+        assert res.afield == 'blah'
+        res = MyType2('a', 'bar')
+        assert res.bfield == 'bar'
+
+    def test_inverted_dict(self):
+        orig = {'x': 'a', 'y': 'b', 'z': 'a'}
+        res = putil.inverted_dict(['x', 'y', 'z'], orig)
+        assert set(res['a']) == {'x', 'z'} and res['b'] == ['y']
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tox.ini b/tox.ini
index dbbde5e..cdb7381 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ distribute = False
 commands =
     coverage run --module pytest --junitxml xunit-results.xml
     coverage xml --omit=".tox/py3/*","test/*"
-    coverage report --omit=".tox/py3/*","test/*"
+    coverage report -m --omit=".tox/py3/*","test/*"
     # TODO: need to update the above "omit" when we package osdf as pip-installable
 deps = -r{toxinidir}/requirements.txt 
     -r{toxinidir}/test/test-requirements.txt