Change-Id: I1dfd73fe4a934ed1f46d016bdb29df17dfda2a75
Issue-ID: VFC-1429
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
ARG HTTP_PROXY=${HTTP_PROXY}
ARG HTTPS_PROXY=${HTTPS_PROXY}
ARG HTTP_PROXY=${HTTP_PROXY}
ARG HTTPS_PROXY=${HTTPS_PROXY}
apk --no-cache update
apk --no-cache add bash curl gcc wget mysql-client openssl-dev
apk --no-cache update
apk --no-cache add bash curl gcc wget mysql-client openssl-dev
- apk --no-cache add python-dev libffi-dev musl-dev py2-virtualenv
+ apk --no-cache add python36-dev libffi-dev musl-dev py3-virtualenv
# get binary zip from nexus - vfc-nfvo-driver-vnfm-svnfm-zte-vmanager
wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=${pkg_verison}-SNAPSHOT&e=zip" && \
# get binary zip from nexus - vfc-nfvo-driver-vnfm-svnfm-zte-vmanager
wget -q -O vfc-nfvo-driver-vnfm-svnfm-zte-vmanager.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager&a=vfc-nfvo-driver-vnfm-svnfm-zte-vmanager&v=${pkg_verison}-SNAPSHOT&e=zip" && \
return Response(data=resp_data, status=status.HTTP_200_OK)
except Exception as e:
return Response(data=resp_data, status=status.HTTP_200_OK)
except Exception as e:
- logger.error("Error occurred when instantiating VNF,error:%s", e.message)
+ logger.error("Error occurred when instantiating VNF,error:%s", e.args[0])
logger.error(traceback.format_exc())
return Response(
data={
logger.error(traceback.format_exc())
return Response(
data={
logger.debug("[%s]resp_data=%s", funname, resp_data)
return Response(data=resp_data, status=status.HTTP_200_OK)
except Exception as e:
logger.debug("[%s]resp_data=%s", funname, resp_data)
return Response(data=resp_data, status=status.HTTP_200_OK)
except Exception as e:
- logger.error("Error occurred when terminating VNF,error: %s", e.message)
+ logger.error("Error occurred when terminating VNF,error: %s", e.args[0])
logger.error(traceback.format_exc())
return Response(
data={
logger.error(traceback.format_exc())
return Response(
data={
logger.debug("[%s]resp_data=%s", funname, resp_data)
return Response(data=resp_data, status=status.HTTP_200_OK)
except Exception as e:
logger.debug("[%s]resp_data=%s", funname, resp_data)
return Response(data=resp_data, status=status.HTTP_200_OK)
except Exception as e:
- logger.error("Error occurred when querying VNF information,error:%s", e.message)
+ logger.error("Error occurred when querying VNF information,error:%s", e.args[0])
logger.error(traceback.format_exc())
return Response(
data={
logger.error(traceback.format_exc())
return Response(
data={
return Response(data=resp_data, status=status.HTTP_200_OK)
except Exception as e:
return Response(data=resp_data, status=status.HTTP_200_OK)
except Exception as e:
- logger.error("Error occurred when getting operation status information,error:%s", e.message)
+ logger.error("Error occurred when getting operation status information,error:%s", e.args[0])
logger.error(traceback.format_exc())
return Response(
data={
logger.error(traceback.format_exc())
return Response(
data={
return Response(data=resp_data, status=status.HTTP_201_CREATED)
except Exception as e:
return Response(data=resp_data, status=status.HTTP_201_CREATED)
except Exception as e:
- logger.error("Error occurred in Grant VNF, error: %s", e.message)
+ logger.error("Error occurred in Grant VNF, error: %s", e.args[0])
logger.error(traceback.format_exc())
return Response(
data={
logger.error(traceback.format_exc())
return Response(
data={
return Response(data=None, status=status.HTTP_200_OK)
except Exception as e:
return Response(data=None, status=status.HTTP_200_OK)
except Exception as e:
- logger.error("Error occurred in LCM notification,error: %s", e.message)
+ logger.error("Error occurred in LCM notification,error: %s", e.args[0])
logger.error(traceback.format_exc())
return Response(
data={
logger.error(traceback.format_exc())
return Response(
data={
return Response(data=resp_data, status=status.HTTP_202_ACCEPTED)
except Exception as e:
return Response(data=resp_data, status=status.HTTP_202_ACCEPTED)
except Exception as e:
- logger.error("Error occurred when scaling VNF,error:%s", e.message)
+ logger.error("Error occurred when scaling VNF,error:%s", e.args[0])
logger.error(traceback.format_exc())
return Response(
data={
logger.error(traceback.format_exc())
return Response(
data={
return Response(data=resp_data, status=status.HTTP_202_ACCEPTED)
except Exception as e:
return Response(data=resp_data, status=status.HTTP_202_ACCEPTED)
except Exception as e:
- logger.error("Error occurred when healing VNF,error:%s", e.message)
+ logger.error("Error occurred when healing VNF,error:%s", e.args[0])
logger.error(traceback.format_exc())
return Response(
data={
logger.error(traceback.format_exc())
return Response(
data={
import logging
import sys
import traceback
import logging
import sys
import traceback
import uuid
import httplib2
import uuid
import httplib2
ret = [1, "Unable to connect to %s" % full_url, resp_status]
continue
raise ex
ret = [1, "Unable to connect to %s" % full_url, resp_status]
continue
raise ex
- except urllib2.URLError as err:
+ except urllib.error.URLError as err:
ret = [2, str(err), resp_status]
except Exception as ex:
logger.error(traceback.format_exc())
ret = [2, str(err), resp_status]
except Exception as ex:
logger.error(traceback.format_exc())
response = self.client.get("/api/ztevnfmdriver/v1/swagger.json")
with open(options['name'], 'w') as swagger_file:
swagger_file.write(json.dumps(response.data))
response = self.client.get("/api/ztevnfmdriver/v1/swagger.json")
with open(options['name'], 'w') as swagger_file:
swagger_file.write(json.dumps(response.data))
- print "swagger api is written to %s" % options['name']
+ print("swagger api is written to %s" % options['name'])
-Django==1.11.9
-djangorestframework==3.7.7
+Django==2.1.4
+djangorestframework==3.9.4
# for call rest api
httplib2==0.12.3
# for unit test
coverage==4.2
# for call rest api
httplib2==0.12.3
# for unit test
coverage==4.2
unittest_xml_reporting==1.12.0
# for auto swagger
unittest_xml_reporting==1.12.0
# for auto swagger
swagger-spec-validator>=2.1.0
# for onap logging
swagger-spec-validator>=2.1.0
# for onap logging
# uwsgi for parallel processing
# uwsgi for parallel processing
-# nohup python manage.py runserver 0.0.0.0:8410 > /dev/null &
+nohup python manage.py runserver 0.0.0.0:8410 > /dev/null &
-if [ "${SSL_ENABLED}" = "true" ]; then
- nohup uwsgi --https :8410,driver/pub/ssl/cert/foobar.crt,driver/pub/ssl/cert/foobar.key, -t 120 --module driver.wsgi --master --processes 4 &
-else
- nohup uwsgi --http :8410 -t 120 --module driver.wsgi --master --processes 4 &
-fi
+# if [ "${SSL_ENABLED}" = "true" ]; then
+# nohup uwsgi --https :8410,driver/pub/ssl/cert/foobar.crt,driver/pub/ssl/cert/foobar.key, -t 120 --module driver.wsgi --master --processes 4 &
+# else
+# nohup uwsgi --http :8410 -t 120 --module driver.wsgi --master --processes 4 &
+# fi
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-# ps auxww | grep "manage.py runserver 0.0.0.0:8410" | awk '{print $2}' | xargs kill -9
+ps auxww | grep "manage.py runserver 0.0.0.0:8410" | awk '{print $1}' | xargs kill -9
-ps auxww |grep 'uwsgi --http' |awk '{print $1}' |xargs kill -9
+# ps auxww |grep 'uwsgi --http' |awk '{print $1}' |xargs kill -9
skipsdist = true
[testenv]
skipsdist = true
[testenv]
deps = flake8
commands = flake8
deps = flake8
commands = flake8
commands =
{[testenv]commands}
[testenv:cov]
commands =
{[testenv]commands}
[testenv:cov]
commands = coverage xml --omit="*test*,*__init__.py,*site-packages*"
\ No newline at end of file
commands = coverage xml --omit="*test*,*__init__.py,*site-packages*"
\ No newline at end of file