Added test to deploy script

.gitignore

@@ -0,0 +1,3 @@
+venv/
+config.json
+__pycache__

Checker/main.py

@@ -1,153 +0,0 @@
-import requests
-import random
-import math
-import time
-import threading
-import logging
-import numpy as np
-import matplotlib.pyplot as plt
-import scipy.stats as stats
-
-logging.getLogger().setLevel(logging.INFO)
-
-
-API_URL = " http://34.234.169.21:80/"
-
-
-UNIT = 5.0  # secs
-
-# Pre generated primes
-first_primes_list = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29,
-                     31, 37, 41, 43, 47, 53, 59, 61, 67,
-                     71, 73, 79, 83, 89, 97, 101, 103,
-                     107, 109, 113, 127, 131, 137, 139,
-                     149, 151, 157, 163, 167, 173, 179,
-                     181, 191, 193, 197, 199, 211, 223,
-                     227, 229, 233, 239, 241, 251, 257,
-                     263, 269, 271, 277, 281, 283, 293,
-                     307, 311, 313, 317, 331, 337, 347, 349]
-
-
-def nBitRandom(n):
-    return random.randrange(2**(n-1)+1, 2**n - 1)
-
-
-def getLowLevelPrime(n):
-    '''Generate a prime candidate divisible
-    by first primes'''
-    while True:
-        # Obtain a random number
-        pc = nBitRandom(n)
-
-        # Test divisibility by pre-generated
-        # primes
-        for divisor in first_primes_list:
-            if pc % divisor == 0 and divisor**2 <= pc:
-                break
-        else:
-            return pc
-
-
-def isMillerRabinPassed(mrc):
-    '''Run 20 iterations of Rabin Miller Primality test'''
-    maxDivisionsByTwo = 0
-    ec = mrc-1
-    while ec % 2 == 0:
-        ec >>= 1
-        maxDivisionsByTwo += 1
-    assert(2**maxDivisionsByTwo * ec == mrc-1)
-
-    def trialComposite(round_tester):
-        if pow(round_tester, ec, mrc) == 1:
-            return False
-        for i in range(maxDivisionsByTwo):
-            if pow(round_tester, 2**i * ec, mrc) == mrc-1:
-                return False
-        return True
-
-    # Set number of trials here
-    numberOfRabinTrials = 20
-    for i in range(numberOfRabinTrials):
-        round_tester = random.randrange(2, mrc)
-        if trialComposite(round_tester):
-            return False
-    return True
-
-
-def random_large_prime(bits):
-    while True:
-        prime_candidate = getLowLevelPrime(bits)
-        if not isMillerRabinPassed(prime_candidate):
-            continue
-        else:
-            return prime_candidate
-
-
-def thread_function(i, fast, timeout):
-    start = time.time()
-
-    c = 5  # bits: 20: 200ms; 21: 350ms; 22: 700ms  23: 1.5s; 25: 6s; 26: 10s; 27: 24s
-    bits = 19 if fast else 23
-    last_report = time.time()
-    processing_time = 0.0
-    reqs = 0
-    while True:
-        iter_start = time.time()
-        if iter_start - start > timeout:
-            logging.info("Thread: %d\treqs: %d\tmean time: %.3fs\t%s" % (
-                i, reqs, processing_time/reqs if reqs > 0 else 0.0, "fast\t" if fast else ""))
-            results[i][iter_start] = processing_time/reqs if reqs > 0 else 0.0
-            return
-        if iter_start - last_report > UNIT/2:
-            if len(results[i]) % 2 == 0:
-                logging.info("Thread: %d\treqs: %d\tmean time: %.3fs\t%s" % (
-                    i, reqs, processing_time/reqs if reqs > 0 else 0.0, "fast\t" if fast else ""))
-            results[i][iter_start] = processing_time/reqs if reqs > 0 else 0.0
-            processing_time = 0.0
-            reqs = 0
-            last_report = iter_start
-
-        factors = [random_large_prime(bits) for i in range(c)]
-        factors.sort()
-        n = math.prod(factors)
-
-        r = requests.get(API_URL+'/factors/%d' % (n))
-        if r.status_code != 200:
-            logging.error("wrong status code from webservice" +
-                          str(r.status_code))
-        else:
-            result = r.json()
-            if result != factors:
-                logging.error("Wrong factors")
-
-        processing_time += time.time() - iter_start
-        reqs += 1
-        time.sleep(0.5)
-
-
-START = time.time()
-slow_threads = 4
-
-results = [{} for i in range(slow_threads+1)]
-
-t0 = threading.Thread(target=thread_function, args=(
-    0, True, (5 + slow_threads*3) * UNIT))
-t0.start()
-time.sleep(2 * UNIT)
-for i in range(slow_threads):
-    t = threading.Thread(target=thread_function, args=(
-        i+1, False, (slow_threads-i) * 3 * UNIT))
-    t.start()
-    time.sleep(2 * UNIT)
-
-t0.join()
-
-mu = 0
-std = 1
-for i, result in enumerate(results):
-    x = [(x - START)/UNIT for x in result.keys()]
-    y = result.values()
-    plt.plot(x, y, label="t%d"%(i,))
-
-plt.legend()
-plt.show()

Hetzner/.gitignore

@@ -1,2 +0,0 @@
-venv/
-config.json

README.md

@@ -1,5 +1,4 @@
-1. Skrypt do tworzenia serwerów i load balancera dostępny w folderze Hetzner.
+1. Instalacja paczek komendą "pip3 install -r requirements.txt"
-2. Instalacja paczek komendą "pip3 install -r requirements.txt"
 2. Uzupełnienie pliku config_base.json wartościami token-hetzner i ssh-public
    ```
    {
@@ -19,4 +18,5 @@
 
    ```
 3. Uruchomienie skryptu komendą "python3 deploy.py config_base.json"
-4. Po 60 sekundach jeżeli skrypt nie zostanie zatzymany wszystkie zasoby zostaną usunięte.
+4. Po 30 sekundach jeżeli skrypt nie zostanie zatrzymany uruchomiony zostanie program do ewaluacji stworzonych zasobów.
+5. Po kolejnych 60 sekundach jeżeli skrypt nie zostanie zatzymany wszystkie zasoby zostaną usunięte.

checker.py

@@ -0,0 +1,152 @@
+import requests
+import random
+import math
+import time
+import threading
+import logging
+import numpy as np
+import matplotlib.pyplot as plt
+import scipy.stats as stats
+
+
+def test(ip):
+    logging.getLogger().setLevel(logging.INFO)
+    API_URL = ip
+    UNIT = 5.0  # secs
+
+    # Pre generated primes
+    first_primes_list = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29,
+                         31, 37, 41, 43, 47, 53, 59, 61, 67,
+                         71, 73, 79, 83, 89, 97, 101, 103,
+                         107, 109, 113, 127, 131, 137, 139,
+                         149, 151, 157, 163, 167, 173, 179,
+                         181, 191, 193, 197, 199, 211, 223,
+                         227, 229, 233, 239, 241, 251, 257,
+                         263, 269, 271, 277, 281, 283, 293,
+                         307, 311, 313, 317, 331, 337, 347, 349]
+
+    def nBitRandom(n):
+        return random.randrange(2**(n-1)+1, 2**n - 1)
+
+    def getLowLevelPrime(n):
+        '''Generate a prime candidate divisible
+        by first primes'''
+        while True:
+            # Obtain a random number
+            pc = nBitRandom(n)
+
+            # Test divisibility by pre-generated
+            # primes
+            for divisor in first_primes_list:
+                if pc % divisor == 0 and divisor**2 <= pc:
+                    break
+            else:
+                return pc
+
+    def isMillerRabinPassed(mrc):
+        '''Run 20 iterations of Rabin Miller Primality test'''
+        maxDivisionsByTwo = 0
+        ec = mrc-1
+        while ec % 2 == 0:
+            ec >>= 1
+            maxDivisionsByTwo += 1
+        assert(2**maxDivisionsByTwo * ec == mrc-1)
+
+        def trialComposite(round_tester):
+            if pow(round_tester, ec, mrc) == 1:
+                return False
+            for i in range(maxDivisionsByTwo):
+                if pow(round_tester, 2**i * ec, mrc) == mrc-1:
+                    return False
+            return True
+
+        # Set number of trials here
+        numberOfRabinTrials = 20
+        for i in range(numberOfRabinTrials):
+            round_tester = random.randrange(2, mrc)
+            if trialComposite(round_tester):
+                return False
+        return True
+
+    def random_large_prime(bits):
+        while True:
+            prime_candidate = getLowLevelPrime(bits)
+            if not isMillerRabinPassed(prime_candidate):
+                continue
+            else:
+                return prime_candidate
+
+    def thread_function(i, fast, timeout):
+        start = time.time()
+
+        c = 5  # bits: 20: 200ms; 21: 350ms; 22: 700ms  23: 1.5s; 25: 6s; 26: 10s; 27: 24s
+        bits = 19 if fast else 23
+        last_report = time.time()
+        processing_time = 0.0
+        reqs = 0
+        while True:
+            iter_start = time.time()
+            if iter_start - start > timeout:
+                logging.info("Thread: %d\treqs: %d\tmean time: %.3fs\t%s" % (
+                    i, reqs, processing_time/reqs if reqs > 0 else 0.0, "fast\t" if fast else ""))
+                results[i][iter_start] = processing_time / \
+                    reqs if reqs > 0 else 0.0
+                return
+            if iter_start - last_report > UNIT/2:
+                if len(results[i]) % 2 == 0:
+                    logging.info("Thread: %d\treqs: %d\tmean time: %.3fs\t%s" % (
+                        i, reqs, processing_time/reqs if reqs > 0 else 0.0, "fast\t" if fast else ""))
+                results[i][iter_start] = processing_time / \
+                    reqs if reqs > 0 else 0.0
+                processing_time = 0.0
+                reqs = 0
+                last_report = iter_start
+
+            factors = [random_large_prime(bits) for i in range(c)]
+            factors.sort()
+            n = math.prod(factors)
+
+            r = requests.get(API_URL+'/factors/%d' % (n))
+            if r.status_code != 200:
+                logging.error("wrong status code from webservice" +
+                              str(r.status_code))
+            else:
+                result = r.json()
+                if result != factors:
+                    logging.error("Wrong factors")
+
+            processing_time += time.time() - iter_start
+            reqs += 1
+            time.sleep(0.5)
+
+    START = time.time()
+    slow_threads = 4
+
+    results = [{} for i in range(slow_threads+1)]
+
+    t0 = threading.Thread(target=thread_function, args=(
+        0, True, (5 + slow_threads*3) * UNIT))
+    t0.start()
+    time.sleep(2 * UNIT)
+    for i in range(slow_threads):
+        t = threading.Thread(target=thread_function, args=(
+            i+1, False, (slow_threads-i) * 3 * UNIT))
+        t.start()
+        time.sleep(2 * UNIT)
+
+    t0.join()
+
+    mu = 0
+    std = 1
+    for i, result in enumerate(results):
+        x = [(x - START)/UNIT for x in result.keys()]
+        y = result.values()
+        plt.plot(x, y, label="t%d" % (i,))
+
+    plt.legend()
+    plt.show()
+
+
+if __name__ == '__main__':
+    API_URL = "http://95.217.174.110:8080"
+    test(API_URL)  # next section explains the use of sys.exit

deploy.py

@@ -10,6 +10,7 @@ from hcloud.locations.domain import Location
 from hcloud.images.domain import Image
 from hcloud.server_types.domain import ServerType
 from hcloud.volumes.domain import Volume
+from checker import test
 
 
 class Client_MS:
@@ -147,10 +148,12 @@ class Client_MS:
 
     def print_info(self):
         print("\n----- Server info -----")
-        ip = self.client.load_balancers.get_by_name(
-            self.config["load-balancer-name"]).data_model.public_net.ipv4.ip
         print(
-            f"Webservice dostępny pod adresem: http://{ip}:8080\n")
+            f"Webservice dostępny pod adresem: {self.get_ip()}\n")
+
+    def get_ip(self):
+        return str("http://" + self.client.load_balancers.get_by_name(
+            self.config["load-balancer-name"]).data_model.public_net.ipv4.ip + ":8080")
 
     def delete_all(self):
         for i, server in enumerate(self.servers):
@@ -167,6 +170,21 @@ if __name__ == '__main__':
     else:
         c = Client_MS(sys.argv[1])
         c.print_info()
+
+        # Test creation
+        try:
+            for remaining in range(30, 0, -1):
+                sys.stdout.write("\r")
+                sys.stdout.write(
+                    "Testing server starts in: {:2d}. Press Ctrl + C to stop.".format(remaining))
+                sys.stdout.flush()
+                time.sleep(1)
+            print("")
+            test(c.get_ip())
+        except KeyboardInterrupt:
+            pass
+
+        # Delete assets
         try:
             for remaining in range(60, 0, -1):
                 sys.stdout.write("\r")