Skip to content

Move config to /local #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jboddey merged 4 commits into from
Jun 23, 2023
Merged

Move config to /local #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
801c454
Move config to /local
jboddey Jun 23, 2023
1027486
Fix testing config
jboddey Jun 23, 2023
d707e41
Fix ovs_control config location
jboddey Jun 23, 2023
1c46830
Fix faux dev config location
jboddey Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ venv/
.vscode/
error
pylint.out
local/
__pycache__/
build/
1 change: 0 additions & 1 deletion conf/.gitignore
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions framework/python/src/core/testrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
from device import Device

LOGGER = logger.get_logger('test_run')
CONFIG_FILE = 'conf/system.json'
EXAMPLE_CONFIG_FILE = 'conf/system.json.example'
CONFIG_FILE = 'local/system.json'
EXAMPLE_CONFIG_FILE = 'local/system.json.example'
RUNTIME = 120

LOCAL_DEVICES_DIR = 'local/devices'
Expand Down
5 changes: 2 additions & 3 deletions framework/python/src/net_orc/network_orchestrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import threading
import docker
from docker.types import Mount
from collections import OrderedDict
from common import logger
from common import util
from net_orc.listener import Listener
Expand All @@ -36,8 +35,8 @@
from net_orc.ip_control import IPControl

LOGGER = logger.get_logger('net_orc')
CONFIG_FILE = 'conf/system.json'
EXAMPLE_CONFIG_FILE = 'conf/system.json.example'
CONFIG_FILE = 'local/system.json'
EXAMPLE_CONFIG_FILE = 'local/system.json.example'
RUNTIME_DIR = 'runtime'
TEST_DIR = 'test'
MONITOR_PCAP = 'monitor.pcap'
Expand Down
2 changes: 1 addition & 1 deletion framework/python/src/net_orc/network_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
DEVICES_DIR = 'modules/devices'
DEVICE_METADATA = 'conf/module_config.json'
DEVICE_BRIDGE = 'tr-d'
CONF_DIR = 'conf'
CONF_DIR = 'local'
CONF_FILE = 'system.json'


Expand Down
2 changes: 1 addition & 1 deletion framework/python/src/net_orc/ovs_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from common import logger
from common import util

CONFIG_FILE = 'conf/system.json'
CONFIG_FILE = 'local/system.json'
DEVICE_BRIDGE = 'tr-d'
INTERNET_BRIDGE = 'tr-c'
LOGGER = logger.get_logger('ovs_ctrl')
Expand Down
2 changes: 2 additions & 0 deletions local/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
system.json
devices
0 conf/system.json.example → local/system.json.example
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion testing/test_baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sudo /usr/share/openvswitch/scripts/ovs-ctl start
# Build Test Container
sudo docker build ./testing/docker/ci_baseline -t ci1 -f ./testing/docker/ci_baseline/Dockerfile

cat <<EOF >conf/system.json
cat <<EOF >local/system.json
{
"network": {
"device_intf": "endev0a",
Expand Down