Skip to content
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

Update experimental setup for up-to-date versions #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update experimental setup for up-to-date versions #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions network_sim/linux_containers/configScriptGenerator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,33 @@ function capitalizeFirstLetter(str) {
return str.charAt(0).toUpperCase() + str.slice(1);
}

function addNetworkConfig(networkConfigs, bridgeName, addr) {
networkConfigs += 'lxc.network.type = veth\n';
networkConfigs += 'lxc.network.link = ' + bridgeName + '\n';
networkConfigs += 'lxc.network.ipv4 = ' + addr + '/24\n';
networkConfigs += 'lxc.network.flags = up\n';
function addNetworkConfig(networkConfigs, bridgeName, addr, iswifi) {
networkConfigs += 'lxc.net.' + iswifi + '.type = veth\n';
networkConfigs += 'lxc.net.' + iswifi + '.link = ' + bridgeName + '\n';
networkConfigs += 'lxc.net.' + iswifi + '.ipv4.address = ' + addr + '/24\n';
networkConfigs += 'lxc.net.' + iswifi + '.flags = up\n';
return networkConfigs;
}

function generateLxcConfigs(devList) {
var templateStr = fs.readFileSync('templates/lxc.conf.template', 'utf-8');
for (var i = 0; i < devList.length; i++) {
var iswifi = 0
var dev = devList[i];
var devName = dev.name;
var bridgeName = getBridgeName(devName);
var lxcConfStr = templateStr.replace(new RegExp('BRIDGE_NAME', 'g'), bridgeName);
lxcConfStr = lxcConfStr.replace(new RegExp('CONTAINER_NAME', 'g'), getContainerName(devName));

var networkConfigs = '';
networkConfigs = addNetworkConfig(networkConfigs, bridgeName, dev.addr);
networkConfigs = addNetworkConfig(networkConfigs, bridgeName, dev.addr, iswifi);
if (dev.wifi) {
iswifi = 1
networkConfigs += '\n';
networkConfigs = addNetworkConfig(networkConfigs, bridgeName + 'wifi', dev.wifi);
networkConfigs = addNetworkConfig(networkConfigs, bridgeName + 'wifi', dev.wifi, iswifi);
}

networkConfigs += "lxc.idmap = u 0 100000 65536\n";
networkConfigs += "lxc.idmap = g 0 100000 65536\n";
lxcConfStr = lxcConfStr.replace('NET_CONF', networkConfigs);
fs.writeFileSync(getLxcConfFileName(devName), lxcConfStr, 'utf-8');
}
Expand Down
6 changes: 6 additions & 0 deletions network_sim/linux_containers/file_sharing_devList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{"name": "auth101", "type": "auth", "addr": "10.0.0.1", "wifi": "10.0.1.1", "position":{"x":0, "y":0, "z":0}},
{"name": "net1.uploader", "type": "uploader", "addr": "10.0.1.3", "position":{"x":10, "y":0, "z":0}},
{"name": "net1.downloader", "type": "downloader", "addr": "10.0.1.4", "position":{"x":15, "y":0, "z":0}},
{"name": "net1.FileSystemManager", "type": "fileSystemManager", "addr": "10.0.1.5", "position":{"x":25, "y":0, "z":0}}
]
2 changes: 1 addition & 1 deletion network_sim/linux_containers/templates/lxc.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Container with network virtualized using a pre-configured bridge named BRIDGE_NAME and
# veth pair virtual network devices
lxc.utsname = CONTAINER_NAME
lxc.uts.name = CONTAINER_NAME

NET_CONF
lxc.mount.entry = /home/hokeunkim/Development home/hokeunkim/Development none bind,create=dir 0.0
Expand Down