Updated install.sh
This commit is contained in:
@ -83,13 +83,13 @@ if [[ -e /etc/os-release ]]; then
|
||||
|
||||
if [[ $INSTALL_DATABASE -eq 1 ]]; then
|
||||
if [[ $ID = 'ubuntu' || $ID = 'debian' ]]; then
|
||||
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server python-mysqldb
|
||||
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server python3-mysqldb
|
||||
# HSFD changes for Ubuntu 18.04
|
||||
sudo sed -i -e "/bind-address/d" /etc/mysql/mysql.conf.d/mysqld.cnf
|
||||
#sudo sed -i -e "/bind-address/d" /etc/mysql/my.cnf
|
||||
sudo service mysql restart
|
||||
elif [[ $ID = 'fedora' ]]; then
|
||||
sudo dnf install -y mariadb-server python-mysql
|
||||
sudo dnf install -y mariadb-server python3-mysql
|
||||
printf "[mysqld]\nbind-address = 127.0.0.1\n" | sudo tee /etc/my.cnf.d/faafo.conf
|
||||
sudo systemctl enable mariadb
|
||||
sudo systemctl start mariadb
|
||||
@ -117,7 +117,7 @@ if [[ -e /etc/os-release ]]; then
|
||||
|
||||
if [[ $INSTALL_FAAFO -eq 1 ]]; then
|
||||
if [[ $ID = 'ubuntu' || $ID = 'debian' ]]; then
|
||||
sudo apt-get install -y python-dev python-pip supervisor git zlib1g-dev libmysqlclient-dev python-mysqldb
|
||||
sudo apt-get install -y python3-dev python3-pip supervisor git zlib1g-dev libmysqlclient-dev python3-mysqldb
|
||||
# Following is needed because of
|
||||
# https://bugs.launchpad.net/ubuntu/+source/supervisor/+bug/1594740
|
||||
if [ $(lsb_release --short --codename) = xenial ]; then
|
||||
@ -131,7 +131,7 @@ if [[ -e /etc/os-release ]]; then
|
||||
fi
|
||||
fi
|
||||
elif [[ $ID = 'fedora' ]]; then
|
||||
sudo dnf install -y python-devel python-pip supervisor git zlib-devel mariadb-devel gcc which python-mysql
|
||||
sudo dnf install -y python3-devel python3-pip supervisor git zlib-devel mariadb-devel gcc which python3-mysql
|
||||
sudo systemctl enable supervisord
|
||||
sudo systemctl start supervisord
|
||||
#elif [[ $ID = 'opensuse' || $ID = 'sles' ]]; then
|
||||
|
@ -1,56 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
# 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 json
|
||||
import requests
|
||||
|
||||
url = 'http://127.0.0.1/api/fractal'
|
||||
headers = {'Content-Type': 'application/json'}
|
||||
|
||||
uuid = '13bf15a8-9f6c-4d59-956f-7d20f7484687'
|
||||
data = {
|
||||
'uuid': uuid,
|
||||
'width': 100,
|
||||
'height': 100,
|
||||
'iterations': 10,
|
||||
'xa': 1.0,
|
||||
'xb': -1.0,
|
||||
'ya': 1.0,
|
||||
'yb': -1.0,
|
||||
}
|
||||
response = requests.post(url, data=json.dumps(data), headers=headers)
|
||||
assert response.status_code == 201
|
||||
|
||||
response = requests.get(url, headers=headers)
|
||||
assert response.status_code == 200
|
||||
print(response.json())
|
||||
|
||||
response = requests.get(url + '/' + uuid, headers=headers)
|
||||
assert response.status_code == 200
|
||||
print(response.json())
|
||||
|
||||
data = {
|
||||
'checksum': 'c6fef4ef13a577066c2281b53c82ce2c7e94e',
|
||||
'duration': 10.12
|
||||
}
|
||||
response = requests.put(url + '/' + uuid, data=json.dumps(data),
|
||||
headers=headers)
|
||||
assert response.status_code == 200
|
||||
|
||||
response = requests.get(url + '/' + uuid, headers=headers)
|
||||
assert response.status_code == 200
|
||||
print(response.json())
|
||||
|
||||
response = requests.delete(url + '/' + uuid, headers=headers)
|
||||
assert response.status_code == 204
|
Reference in New Issue
Block a user