From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Mon, 6 Dec 2010 20:30:51 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/plcapi
X-Git-Tag: plcapi-5.0-23~1^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=79804af429d6b019b8427372213f733684c6981a;hp=78551fddb89e9c7085e1bb0e526e7498a9e50d75;p=plcapi.git

Merge branch 'master' of ssh://git.planet-lab.org/git/plcapi
---

diff --git a/PLC/Accessors/Accessors_example_ple.py b/PLC/Accessors/Accessors_example_ple.py
index 6559abf..6f8b40d 100644
--- a/PLC/Accessors/Accessors_example_ple.py
+++ b/PLC/Accessors/Accessors_example_ple.py
@@ -6,7 +6,6 @@ methods=[]
 from PLC.Nodes import Node
 from PLC.Interfaces import Interface
 from PLC.Slices import Slice
-#from PLC.Ilinks import Ilink
 
 from PLC.Accessors.Factory import define_accessors, all_roles, tech_roles
 
diff --git a/PLC/Accessors/Accessors_myslice.py b/PLC/Accessors/Accessors_myslice.py
new file mode 100644
index 0000000..7851773
--- /dev/null
+++ b/PLC/Accessors/Accessors_myslice.py
@@ -0,0 +1,21 @@
+#
+# Thierry Parmentelat - INRIA
+#
+#from PLC.Nodes import Node
+#from PLC.Interfaces import Interface
+#from PLC.Slices import Slice
+#from PLC.Sites import Site
+from PLC.Persons import Person
+
+from PLC.Accessors.Factory import define_accessors, admin_roles, all_roles, tech_roles
+
+import sys
+current_module = sys.modules[__name__]
+
+define_accessors(current_module, Person, "Columnconf", "columnconf",
+                  "person/myslice", "column configuration",
+                  get_roles=all_roles, set_roles=all_roles, expose_in_api=True)
+
+define_accessors(current_module, Person, "Showconf", "showconf",
+                  "person/myslice", "show configuration",
+                  get_roles=all_roles, set_roles=all_roles, expose_in_api=True)
diff --git a/PLC/Accessors/Accessors_site.py b/PLC/Accessors/Accessors_site.py
index a9f35be..b51d42e 100644
--- a/PLC/Accessors/Accessors_site.py
+++ b/PLC/Accessors/Accessors_site.py
@@ -24,7 +24,6 @@ from PLC.Interfaces import Interface
 from PLC.Slices import Slice
 from PLC.Sites import Site
 from PLC.Persons import Person
-#from PLC.Ilinks import Ilink
 
 from PLC.Accessors.Factory import define_accessors, all_roles, person_roles, tech_roles
 
diff --git a/PLC/Accessors/Accessors_sliverauth.py b/PLC/Accessors/Accessors_sliverauth.py
index 6debf3d..5fcfbf3 100644
--- a/PLC/Accessors/Accessors_sliverauth.py
+++ b/PLC/Accessors/Accessors_sliverauth.py
@@ -4,7 +4,6 @@
 from PLC.Nodes import Node
 from PLC.Interfaces import Interface
 from PLC.Slices import Slice
-from PLC.Slices import Slice
 from PLC.Sites import Site
 from PLC.Persons import Person
 
diff --git a/PLC/Accessors/Accessors_standard.py b/PLC/Accessors/Accessors_standard.py
index c3daf6e..c4cc2bc 100644
--- a/PLC/Accessors/Accessors_standard.py
+++ b/PLC/Accessors/Accessors_standard.py
@@ -4,10 +4,8 @@
 from PLC.Nodes import Node
 from PLC.Interfaces import Interface
 from PLC.Slices import Slice
-from PLC.Slices import Slice
 from PLC.Sites import Site
 from PLC.Persons import Person
-#from PLC.Ilinks import Ilink
 
 from PLC.Accessors.Factory import define_accessors, admin_roles, all_roles, tech_roles
 
diff --git a/PLC/Accessors/Accessors_wireless.py b/PLC/Accessors/Accessors_wireless.py
index 67af16e..3f3948a 100644
--- a/PLC/Accessors/Accessors_wireless.py
+++ b/PLC/Accessors/Accessors_wireless.py
@@ -4,7 +4,6 @@
 from PLC.Nodes import Node
 from PLC.Interfaces import Interface
 from PLC.Slices import Slice
-#from PLC.Ilinks import Ilink
 
 from PLC.Accessors.Factory import define_accessors, all_roles, tech_roles
 
diff --git a/PLC/Accessors/__init__.py b/PLC/Accessors/__init__.py
index 738fbe0..f2ef396 100644
--- a/PLC/Accessors/__init__.py
+++ b/PLC/Accessors/__init__.py
@@ -2,6 +2,7 @@
 
 __all__ = """
 Accessors_standard
+Accessors_myslice
 Accessors_wireless
 Accessors_sliverauth
 Accessors_site