Merge pull request GoogleCloudPlatform#2 from googledrew/master-prakhag1

upgrade to locust 0.11.0, python 3.7

Author: prakhag1

docker-image/Dockerfile

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 
-# Start with a base Python 2.7.8 image
-FROM python:2.7.8
+# Start with a base Python 3.7.2 image
+FROM python:3.7.2
 
 # Add the licenses for third party software and libraries
 ADD licenses /licenses

docker-image/locust-tasks/requirements.txt

@@ -1,11 +1,18 @@
-Flask==0.12.3
-gevent==1.0.1
-greenlet==0.4.5
-itsdangerous==0.24
-Jinja2==2.7.3
-locustio==0.7.2
-MarkupSafe==0.23
-msgpack-python==0.4.6
-pyzmq==14.5.0
-requests==2.20.0
-Werkzeug==0.10.4
+certifi==2019.3.9
+chardet==3.0.4
+Click==7.0
+Flask==1.0.2
+gevent==1.4.0
+greenlet==0.4.15
+idna==2.8
+itsdangerous==1.1.0
+Jinja2==2.10
+locustio==0.11.0
+MarkupSafe==1.1.1
+msgpack==0.6.1
+msgpack-python==0.5.6
+pyzmq==18.0.1
+requests==2.21.0
+six==1.12.0
+urllib3==1.24.1
+Werkzeug==0.15.1

sample-webapp/app.py

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 
-runtime: python27
-api_version: 1
-threadsafe: true
+runtime: python37
+
+instance_class: F2
 
 handlers:
 - url: /.*
-  script: app.app
+  script: auto

sample-webapp/app.yaml

@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+
+# Copyright 2019 Google Inc. 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 flask import Flask, request
+
+app = Flask(__name__)
+
+
+@app.route('/')
+def root():
+    return 'Welcome to the "Distributed Load Testing Using Kubernetes" sample web app\n'
+
+@app.route('/login',  methods=['GET', 'POST'])
+def login():
+    deviceid = request.values.get('deviceid')
+    return '/login - device: {}\n'.format(deviceid)
+
+@app.route('/metrics',  methods=['GET', 'POST'])
+def metrics():
+    deviceid = request.values.get('deviceid')
+    timestamp = request.values.get('timestamp')
+    
+    return '/metrics - device: {}, timestamp: {}\n'.format(deviceid, timestamp)
+
+
+if __name__ == '__main__':
+    # This is used when running locally only. When deploying to Google App
+    # Engine, a webserver process such as Gunicorn will serve the app. This
+    # can be configured by adding an `entrypoint` to app.yaml.
+    # Flask's development server will automatically serve static files in
+    # the "static" directory. See:
+    # http://flask.pocoo.org/docs/1.0/quickstart/#static-files. Once deployed,
+    # App Engine itself will serve those files as configured in app.yaml.
+    app.run(host='127.0.0.1', port=8080, debug=True)

sample-webapp/main.py

@@ -0,0 +1 @@
+Flask>=1.0.2