From 4f8d3a1485c2743a9d528714a22525fd19ff72d0 Mon Sep 17 00:00:00 2001 From: Ahmed Bilal Khalid Date: Wed, 28 Aug 2019 13:22:50 +0500 Subject: [PATCH] a --- app/api.py | 54 +++++++++++++++++++++++++-------------------------- app/helper.py | 1 + 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/app/api.py b/app/api.py index 3a60f05..8ac4795 100644 --- a/app/api.py +++ b/app/api.py @@ -22,30 +22,30 @@ def api(): def setup(path, auth_name, auth_seed, auth_realm, realm_allowed, otp_server): - os.chdir(path) - - - # Install Package - op = PackageManagementOperation.install("asdnioasndisa") - - # Git Operation Depends on success of previous operation i.e PackageManagementOperation - op.add(GitOperation.clone("https://code.ungleich.ch/ungleich-public/ucloud-api.git")) - - content = f"AUTH_NAME={auth_name}\n" \ - f"AUTH_SEED={auth_seed}\n" \ - f"AUTH_REALM={auth_seed}\n" \ - f"REALM_ALLOWED={list(realm_allowed)}\n" \ - f"OTP_SERVER={otp_server}\n" - - # FileOperation depends on success of previos operation i.e GitOperation.clone - op.add(FileOperation.write, - path=os.path.join("ucloud-api", ".env"), - content=content) - - op.add(GitOperation.clone, path="ucloud-api", - url="https://code.ungleich.ch/ungleich-public/ucloud_common") - - op.add(GitOperation.clone, path="ucloud-api", - url="https://code.ungleich.ch/ahmedbilal/etcd3_wrapper") - - op.add(PipenvOperation.install, path="ucloud-api") + os.chdir(path) + + + # Install Package + op = PackageManagementOperation.install("asdnioasndisa") + + # Git Operation Depends on success of previous operation i.e PackageManagementOperation + op.add(GitOperation.clone("https://code.ungleich.ch/ungleich-public/ucloud-api.git")) + + content = f"AUTH_NAME={auth_name}\n" \ + f"AUTH_SEED={auth_seed}\n" \ + f"AUTH_REALM={auth_seed}\n" \ + f"REALM_ALLOWED={list(realm_allowed)}\n" \ + f"OTP_SERVER={otp_server}\n" + + # FileOperation depends on success of previos operation i.e GitOperation.clone + op.add(FileOperation.write, + path=os.path.join("ucloud-api", ".env"), + content=content) + + op.add(GitOperation.clone, path="ucloud-api", + url="https://code.ungleich.ch/ungleich-public/ucloud_common") + + op.add(GitOperation.clone, path="ucloud-api", + url="https://code.ungleich.ch/ahmedbilal/etcd3_wrapper") + + op.add(PipenvOperation.install, path="ucloud-api") diff --git a/app/helper.py b/app/helper.py index 449c3c3..45a1048 100644 --- a/app/helper.py +++ b/app/helper.py @@ -96,6 +96,7 @@ def get_distro_name(): start = content.find("ID=") + 3 end = content.find("\n", start) distro_name = content[start:end] + print(distro_name) return distro_name class PackageManagementOperation(object):