From e9b0065a02763ed6ba0d6499c8d4fc723eb3a410 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 26 May 2008 14:13:19 +0000 Subject: [PATCH] moving towards 5.0 --- Makefile | 29 +++++++++++++++++++++++++++++ PlanetLabConf/blacklist.php | 6 +++--- PlanetLabConf/bwlimit.php | 10 +++++----- PlanetLabConf/getupdatesxml.php | 6 +++--- PlanetLabConf/keys.php | 6 +++--- PlanetLabConf/ntp.conf.php | 8 ++++---- PlanetLabConf/ntp/step-tickers.php | 8 ++++---- PlanetLabConf/proxies.php | 20 ++++++++++---------- PlanetLabConf/sysctl.php | 12 ++++++------ boot/getnodeid.php | 8 ++++---- boot/index.php | 8 ++++---- 11 files changed, 75 insertions(+), 46 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..61e5690 --- /dev/null +++ b/Makefile @@ -0,0 +1,29 @@ +### $Id$ +# +# how to push a working directoy to a running plc +# + +tags: + find . -type f | grep -v '/\.svn/' | egrep -v '/(uudecode.gz|tags|TAGS)$$' | xargs etags + +########## make sync PLCHOST=hostname VSERVER=vservername +ifdef PLCHOST +ifdef VSERVER +PLCSSH:=root@$(PLCHOST):/vservers/$(VSERVER) +endif +endif + +LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' +RSYNC_EXCLUDES := --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) +RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,) +RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES) + +sync: +ifeq (,$(PLCSSH)) + echo "sync: You must define PLCHOST and VSERVER on the command line" + echo " e.g. make sync PLCHOST=private.one-lab.org VSERVER=myplc01" ; exit 1 +else + +$(RSYNC) PlanetLabConf boot PLCAPI $(PLCSSH)/var/www/html/ + ssh root@$(PLCHOST) vserver $(VSERVER) exec apachectl graceful +endif + diff --git a/PlanetLabConf/blacklist.php b/PlanetLabConf/blacklist.php index 8966f6d..622e6ce 100755 --- a/PlanetLabConf/blacklist.php +++ b/PlanetLabConf/blacklist.php @@ -22,9 +22,9 @@ require_once 'plc_api.php'; global $adm; // Look up the node -$nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); -if (!empty($nodenetworks)) { - $nodes = $adm->GetNodes(array($nodenetworks[0]['node_id'])); +$interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); +if (!empty($interfaces)) { + $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); if (!empty($nodes)) { $node = $nodes[0]; } diff --git a/PlanetLabConf/bwlimit.php b/PlanetLabConf/bwlimit.php index 3e3cbc9..850e864 100755 --- a/PlanetLabConf/bwlimit.php +++ b/PlanetLabConf/bwlimit.php @@ -13,10 +13,10 @@ require_once 'plc_api.php'; global $adm; // Look up the node -$nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); -if (!empty($nodenetworks)) { - if ($nodenetworks[0]['bwlimit'] !== NULL) { - $rate = $nodenetworks[0]['bwlimit']; +$interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); +if (!empty($interfaces)) { + if ($interfaces[0]['bwlimit'] !== NULL) { + $rate = $interfaces[0]['bwlimit']; if ($rate >= 1000000000 && ($rate % 1000000000) == 0) { printf("%.0fgbit", ($rate / 1000000000.)); } elseif ($rate >= 1000000 && ($rate % 1000000) == 0) { @@ -31,4 +31,4 @@ if (!empty($nodenetworks)) { } } -?> \ No newline at end of file +?> diff --git a/PlanetLabConf/getupdatesxml.php b/PlanetLabConf/getupdatesxml.php index 8ca522b..7c1d6ac 100755 --- a/PlanetLabConf/getupdatesxml.php +++ b/PlanetLabConf/getupdatesxml.php @@ -80,9 +80,9 @@ function xmlspecialchars($string, $parsed = ENT_UNPARSED) if (!empty($_REQUEST['node_id'])) { $node = $adm->GetSlivers(intval($_REQUEST['node_id'])); } else { - $nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); - if (!empty($nodenetworks)) { - $node = $adm->GetSlivers($nodenetworks[0]['node_id']); + $interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); + if (!empty($interfaces)) { + $node = $adm->GetSlivers($interfaces[0]['node_id']); } } diff --git a/PlanetLabConf/keys.php b/PlanetLabConf/keys.php index 58721b0..9bbd867 100755 --- a/PlanetLabConf/keys.php +++ b/PlanetLabConf/keys.php @@ -42,9 +42,9 @@ if (isset($_REQUEST[PLC_SLICE_PREFIX . '_monitor'])) { if (isset($_REQUEST['site_admin'])) { // Look up the node - $nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); - if (!empty($nodenetworks)) { - $nodes = $adm->GetNodes(array($nodenetworks[0]['node_id'])); + $interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); + if (!empty($interfaces)) { + $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); if (!empty($nodes)) { $node = $nodes[0]; } diff --git a/PlanetLabConf/ntp.conf.php b/PlanetLabConf/ntp.conf.php index 4676c23..ea3ce63 100755 --- a/PlanetLabConf/ntp.conf.php +++ b/PlanetLabConf/ntp.conf.php @@ -18,9 +18,9 @@ $default_name = "default"; $file_name = $config_directory . $file_prefix . $default_name; // Look up the node -$nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); -if (!empty($nodenetworks)) { - $nodes = $adm->GetNodes(array($nodenetworks[0]['node_id'])); +$interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); +if (!empty($interfaces)) { + $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); if (!empty($nodes)) { $node = $nodes[0]; } @@ -95,4 +95,4 @@ else { readfile($file_name); } -?> \ No newline at end of file +?> diff --git a/PlanetLabConf/ntp/step-tickers.php b/PlanetLabConf/ntp/step-tickers.php index 98d0cc2..7fc31ce 100755 --- a/PlanetLabConf/ntp/step-tickers.php +++ b/PlanetLabConf/ntp/step-tickers.php @@ -18,9 +18,9 @@ $default_name = "default"; $file_name = $config_directory . $file_prefix . $default_name; // Look up the node -$nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); -if (!empty($nodenetworks)) { - $nodes = $adm->GetNodes(array($nodenetworks[0]['node_id'])); +$interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); +if (!empty($interfaces)) { + $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); if (!empty($nodes)) { $node = $nodes[0]; } @@ -77,4 +77,4 @@ foreach ($lines as $line_num => $line) { } } -?> \ No newline at end of file +?> diff --git a/PlanetLabConf/proxies.php b/PlanetLabConf/proxies.php index 39b9b39..d2b893c 100755 --- a/PlanetLabConf/proxies.php +++ b/PlanetLabConf/proxies.php @@ -3,7 +3,7 @@ # # post: service vnet restart # -# Proxy (a.k.a. network telescope a.k.a. honeypot) nodenetwork configuration +# Proxy (a.k.a. network telescope a.k.a. honeypot) interface configuration # # Aaron Klingaman # Mark Huang @@ -18,9 +18,9 @@ require_once 'plc_api.php'; global $adm; // Look up the node -$nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); -if (!empty($nodenetworks)) { - $nodes = $adm->GetNodes(array($nodenetworks[0]['node_id'])); +$interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); +if (!empty($interfaces)) { + $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); if (!empty($nodes)) { $node = $nodes[0]; } @@ -30,18 +30,18 @@ if (!isset($node)) { exit(); } -$nodenetworks = $adm->GetNodeNetworks($node['nodenetwork_ids']); +$interfaces = $adm->GetInterfaces($node['interface_ids']); -foreach ($nodenetworks as $nodenetwork) { - // XXX PL2896: need nodenetworks.device - switch ($nodenetwork['method']) { +foreach ($interfaces as $interface) { + // XXX PL2896: need interfaces.device + switch ($interface['method']) { case 'tap': $dev = "tap0"; - $types['taps'][$dev][0] = $nodenetwork['ip'] . "/" . $nodenetwork['gateway']; + $types['taps'][$dev][0] = $interface['ip'] . "/" . $interface['gateway']; break; case 'proxy': $dev = "proxy0"; - $types['proxies'][$dev][] = $nodenetwork['ip']; + $types['proxies'][$dev][] = $interface['ip']; break; } } diff --git a/PlanetLabConf/sysctl.php b/PlanetLabConf/sysctl.php index edd8e86..127362e 100755 --- a/PlanetLabConf/sysctl.php +++ b/PlanetLabConf/sysctl.php @@ -15,16 +15,16 @@ global $adm; $ip_forward = 0; // Look up the node -$nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); -if (!empty($nodenetworks)) { - $nodes = $adm->GetNodes(array($nodenetworks[0]['node_id'])); +$interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); +if (!empty($interfaces)) { + $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); if (!empty($nodes)) { $node = $nodes[0]; - $nodenetworks = $adm->GetNodeNetworks($node['nodenetwork_ids']); - foreach ($nodenetworks as $nodenetwork) { + $interfaces = $adm->GetInterfaces($node['interface_ids']); + foreach ($interfaces as $interface) { // Nodes with proxy socket interfaces need to be able to forward // between the fake proxy0 interface and the real interface. - if ($nodenetwork['method'] == 'proxy') { + if ($interface['method'] == 'proxy') { $ip_forward = 1; break; } diff --git a/boot/getnodeid.php b/boot/getnodeid.php index 004ce23..fdbf9dd 100755 --- a/boot/getnodeid.php +++ b/boot/getnodeid.php @@ -15,13 +15,13 @@ global $adm; if (!empty($_REQUEST['mac_addr'])) { $mac_lower = strtolower(trim($_REQUEST['mac_addr'])); $mac_upper = strtoupper(trim($_REQUEST['mac_addr'])); - $nodenetworks = $adm->GetNodeNetworks(array('mac' => array($mac_lower, $mac_upper))); + $interfaces = $adm->GetInterfaces(array('mac' => array($mac_lower, $mac_upper))); } else { - $nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); + $interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); } -if (!empty($nodenetworks)) { - print $nodenetworks[0]['node_id']; +if (!empty($interfaces)) { + print $interfaces[0]['node_id']; } else { print "-1"; } diff --git a/boot/index.php b/boot/index.php index ba7dc7b..9afe279 100755 --- a/boot/index.php +++ b/boot/index.php @@ -16,9 +16,9 @@ global $adm; $bootmanager = "bootmanager.sh.sgn"; // Look up the node -$nodenetworks = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR'])); -if (!empty($nodenetworks)) { - $nodes = $adm->GetNodes(array($nodenetworks[0]['node_id'])); +$interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR'])); +if (!empty($interfaces)) { + $nodes = $adm->GetNodes(array($interfaces[0]['node_id'])); if (!empty($nodes)) { $node = $nodes[0]; } @@ -62,7 +62,7 @@ if (isset($node)) { if (!empty($node['nodegroup_ids'])) { $nodegroups = $adm->GetNodeGroups($node['nodegroup_ids']); foreach ($nodegroups as $nodegroup) { - $bootmanagers[] = strtolower($nodegroup['name']) . "_" . $bootmanager; + $bootmanagers[] = strtolower($nodegroup['groupname']) . "_" . $bootmanager; } } } -- 2.43.0