Skip to content

Commit

Permalink
add current path for python modules
Browse files Browse the repository at this point in the history
Added a dot in front of the python files that are imported, so the code
can also be called from other directories

Signed-off-by: Luc Provoost <[email protected]>
Change-Id: I18d4925fcf68c27c91d5e489178bac79edfcf5f4
  • Loading branch information
LucProvoost committed Nov 25, 2024
1 parent cdf25f9 commit 19d12dd
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion VNFs/DPPD-PROX/helper-scripts/rapid/createrapidk8s.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
##

import argparse
from rapid_k8s_deployment import K8sDeployment
from .rapid_k8s_deployment import K8sDeployment

# Config file name for deployment creation
CREATE_CONFIG_FILE_NAME = "rapid.pods"
Expand Down
4 changes: 2 additions & 2 deletions VNFs/DPPD-PROX/helper-scripts/rapid/prox_ctrl.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import time
import subprocess
import socket
from rapid_log import RapidLog
from rapid_sshclient import SSHClient
from .rapid_log import RapidLog
from .rapid_sshclient import SSHClient

class prox_ctrl(object):
def __init__(self, ip, key=None, user=None, password = None, \
Expand Down
4 changes: 2 additions & 2 deletions VNFs/DPPD-PROX/helper-scripts/rapid/rapid_corestatstest.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import sys
import time
import requests
from rapid_log import RapidLog
from rapid_test import RapidTest
from .rapid_log import RapidLog
from .rapid_test import RapidTest

class CoreStatsTest(RapidTest):
"""
Expand Down
6 changes: 3 additions & 3 deletions VNFs/DPPD-PROX/helper-scripts/rapid/rapid_flowsizetest.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
from math import ceil
from statistics import mean
from past.utils import old_div
from rapid_log import RapidLog
from rapid_log import bcolors
from rapid_test import RapidTest
from .rapid_log import RapidLog
from .rapid_log import bcolors
from .rapid_test import RapidTest
inf = float("inf")

class FlowSizeTest(RapidTest):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
## limitations under the License.
##

from rapid_log import RapidLog
from rapid_machine import RapidMachine
from .rapid_log import RapidLog
from .rapid_machine import RapidMachine
from math import ceil, log2


Expand Down
6 changes: 3 additions & 3 deletions VNFs/DPPD-PROX/helper-scripts/rapid/rapid_impairtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import sys
import time
import requests
from rapid_log import RapidLog
from rapid_log import bcolors
from rapid_test import RapidTest
from .rapid_log import RapidLog
from .rapid_log import bcolors
from .rapid_test import RapidTest
from statistics import mean

class ImpairTest(RapidTest):
Expand Down
4 changes: 2 additions & 2 deletions VNFs/DPPD-PROX/helper-scripts/rapid/rapid_irqtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import sys
import time
import requests
from rapid_log import RapidLog
from rapid_test import RapidTest
from .rapid_log import RapidLog
from .rapid_test import RapidTest

class IrqTest(RapidTest):
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import logging
from logging import handlers

from rapid_k8s_pod import Pod
from .rapid_k8s_pod import Pod

class K8sDeployment:
"""Deployment class to create containers for test execution in Kubernetes
Expand Down
2 changes: 1 addition & 1 deletion VNFs/DPPD-PROX/helper-scripts/rapid/rapid_k8s_pod.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import logging
from kubernetes import client, config

from rapid_sshclient import SSHClient
from .rapid_sshclient import SSHClient

class Pod:
"""Class which represents test pods.
Expand Down
4 changes: 2 additions & 2 deletions VNFs/DPPD-PROX/helper-scripts/rapid/rapid_machine.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
## limitations under the License.
##

from rapid_log import RapidLog
from prox_ctrl import prox_ctrl
from .rapid_log import RapidLog
from .prox_ctrl import prox_ctrl
import os
import re
import uuid
Expand Down
2 changes: 1 addition & 1 deletion VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
## limitations under the License.
##

from rapid_log import RapidLog
from .rapid_log import RapidLog
from past.utils import old_div
try:
import configparser
Expand Down
4 changes: 2 additions & 2 deletions VNFs/DPPD-PROX/helper-scripts/rapid/rapid_portstatstest.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import sys
import time
import requests
from rapid_log import RapidLog
from rapid_test import RapidTest
from .rapid_log import RapidLog
from .rapid_test import RapidTest

class PortStatsTest(RapidTest):
"""
Expand Down
4 changes: 2 additions & 2 deletions VNFs/DPPD-PROX/helper-scripts/rapid/rapid_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import os
import copy
from past.utils import old_div
from rapid_log import RapidLog
from rapid_log import bcolors
from .rapid_log import RapidLog
from .rapid_log import bcolors
inf = float("inf")
from datetime import datetime as dt

Expand Down
4 changes: 2 additions & 2 deletions VNFs/DPPD-PROX/helper-scripts/rapid/rapid_warmuptest.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import sys
import time
from rapid_log import RapidLog
from rapid_test import RapidTest
from .rapid_log import RapidLog
from .rapid_test import RapidTest

class WarmupTest(RapidTest):
"""
Expand Down
24 changes: 12 additions & 12 deletions VNFs/DPPD-PROX/helper-scripts/rapid/runrapid.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
import sys
import concurrent.futures
from concurrent.futures import ALL_COMPLETED
from rapid_cli import RapidCli
from rapid_log import RapidLog
from rapid_parser import RapidConfigParser
from rapid_defaults import RapidDefaults
from rapid_machine import RapidMachine
from rapid_generator_machine import RapidGeneratorMachine
from rapid_flowsizetest import FlowSizeTest
from rapid_corestatstest import CoreStatsTest
from rapid_portstatstest import PortStatsTest
from rapid_impairtest import ImpairTest
from rapid_irqtest import IrqTest
from rapid_warmuptest import WarmupTest
from .rapid_cli import RapidCli
from .rapid_log import RapidLog
from .rapid_parser import RapidConfigParser
from .rapid_defaults import RapidDefaults
from .rapid_machine import RapidMachine
from .rapid_generator_machine import RapidGeneratorMachine
from .rapid_flowsizetest import FlowSizeTest
from .rapid_corestatstest import CoreStatsTest
from .rapid_portstatstest import PortStatsTest
from .rapid_impairtest import ImpairTest
from .rapid_irqtest import IrqTest
from .rapid_warmuptest import WarmupTest

class RapidTestManager(object):
"""
Expand Down

0 comments on commit 19d12dd

Please sign in to comment.