PLC API functionality moved to Node Manager

diff --git a/python/Makefile b/python/Makefile
index 4242f57..5007d34 100644 (file)
--- a/python/Makefile
+++ b/python/Makefile
@@ -5,13 +5,13 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #

-# $Id: Makefile,v 1.10 2005/11/01 22:02:04 smuir Exp $
+# $Id: Makefile,v 1.11 2006/03/01 22:03:38 mlhuang Exp $

 #
 
 INCLUDES := -I.. -I../lib
 LIBS = -L../lib -lvserver
 
 #
 
 INCLUDES := -I.. -I../lib
 LIBS = -L../lib -lvserver
 

-PY_MODS := vserver.py cpulimit.py bwlimit.py plcapi.py
+PY_MODS := vserver.py cpulimit.py bwlimit.py

 PY_EXT_MODS := vduimpl.so vserverimpl.so
 
 LT_LINK = ../libtool --tag=CC --mode=link
 PY_EXT_MODS := vduimpl.so vserverimpl.so
 
 LT_LINK = ../libtool --tag=CC --mode=link

diff --git a/python/plcapi.py b/python/plcapi.py
deleted file mode 100644 (file)
index 844c4e6..0000000
--- a/python/plcapi.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/python
-# 
-# PLCAPI access from nodes. Placeholder until we can do this for real
-# using certificate- or session-based authentication. Node Manager
-# should provide some localhost interface for retrieving the proper
-# authentication parameters as well as the API server to use.
-#
-# Mark Huang <mlhuang@cs.princeton.edu>
-# Copyright (C) 2006 The Trustees of Princeton University
-#
-# $Id: bwlimit.py,v 1.7 2006/03/01 18:54:38 mlhuang Exp $
-#
-
-import xmlrpclib
-
-class PLCAPI(xmlrpclib.Server):
-    def __init__(self):
-        # XXX Only support anonymous calls for now
-        self.auth = {'AuthMethod': 'anonymous'}
-        xmlrpclib.Server.__init__(self,
-                                  uri = "https://www.planet-lab.org/PLCAPI/",
-                                  encoding = "utf-8")