From 15bf2046cbe5392c9beb903b07c2f814a64be571 Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Fri, 27 Sep 2013 22:10:58 +0200
Subject: Move some cman-cluster-specific edges: lib{-edges,cman}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also start using as of now enabled "common_{src,dst}_of" to allow
for edges -> metadata association (used in "on_click")

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
---
 cluster-cman.py |  8 ++++----
 lib_cman.py     | 35 ++++++++++++++++++++++++++++++++---
 lib_edges.py    | 20 +++-----------------
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/cluster-cman.py b/cluster-cman.py
index 15cccda..c2608d1 100755
--- a/cluster-cman.py
+++ b/cluster-cman.py
@@ -572,17 +572,17 @@ graph = lambda\
     # cluster management layer - cluster nodes layer
     #
     ]+\
-    [DelegateRICCIRPC\
+    [CmanRicciRPC\
     ('ccs'
     ,'node_a-ricci'
     ,ltail='cluster.management-cli'
     )
-    ,DelegateRICCIRPC\
+    ,CmanRicciRPC\
     ('luci'
     ,'node_b-ricci'
     ,ltail='cluster.management-cli'
     )
-    ,DelegateRICCIRPC\
+    ,CmanRicciRPC\
     ('ccs_sync'
     ,'node_c-ricci'
     ,ltail='cluster.management-cli'
@@ -591,7 +591,7 @@ graph = lambda\
     # outer environment - cluster management layer
     #
     ]+\
-    [DelegateLuciHTTPS\
+    [CmanLuciHTTPS\
     ('firefox'
     ,'luci'
     )
diff --git a/lib_cman.py b/lib_cman.py
index 78bdb1a..3ed8d98 100644
--- a/lib_cman.py
+++ b/lib_cman.py
@@ -11,6 +11,35 @@ from lib_edges import *
 from lib_shared import *
 
 
+#
+# edges/protocols
+#
+
+class CmanRicciRPC(ApplicationSpecificProtocol, Delegate):
+    """[ricci client] -> ricci"""
+    defaults = dict((
+        LABEL('port 11111'),
+    ))
+    summary = 'ricci RPC is a customized variant of XMLRPC'
+    web = 'http://www.sourceware.org/cluster/conga/ricci_api/index.html'
+    #web = 'http://www.sourceware.org/cluster/conga/ricci_api/ricci_api.html'
+
+
+class CmanRicciRPCSrc(object):
+    common_src_of = CmanRicciRPC
+
+
+class CmanLuciHTTPS(HTTPS, Delegate):
+    """[web browser] -> luci"""
+    defaults = dict((
+        LABEL('port 8084'),
+    ))
+
+
+#
+# nodes
+#
+
 class CmanRGManager(Daemon):
     defaults = dict((
         LABEL('rgmanager'),
@@ -112,7 +141,7 @@ class CmanRicci(Daemon):
     )
 
 
-class CmanCcs(Executable):
+class CmanCcs(Executable, CmanRicciRPCSrc):
     defaults = dict((
         LABEL('ccs'),
     ))
@@ -140,7 +169,7 @@ class CmanCcs(Executable):
     )
 
 
-class CmanCcsSync(Executable):
+class CmanCcsSync(Executable, CmanRicciRPCSrc):
     defaults = dict((
         LABEL('ccs_sync'),
     ))
@@ -160,7 +189,7 @@ class CmanCcsSync(Executable):
     )
 
 
-class CmanLuci(Daemon):
+class CmanLuci(Daemon, CmanRicciRPCSrc, HTTPSDst):
     defaults = dict((
         LABEL('luci'),
     ))
diff --git a/lib_edges.py b/lib_edges.py
index 06402ef..e2f96f6 100644
--- a/lib_edges.py
+++ b/lib_edges.py
@@ -32,12 +32,11 @@ class HTTPS(LibEdge):
     defaults = dict((
         STYLE.bold,
     ))
+    summary = 'HTTP over SSL/TLS'
 
 
-class  LuciHTTPS(HTTPS):
-    defaults = dict((
-        LABEL('port 8084'),
-    ))
+class HTTPSDst(LibEdge):
+    common_dst_of = HTTPS
 
 
 class ApplicationSpecificProtocol(LibEdge):
@@ -46,12 +45,6 @@ class ApplicationSpecificProtocol(LibEdge):
     ))
 
 
-class RICCIRPC(ApplicationSpecificProtocol):
-    defaults = dict((
-        LABEL('port 11111'),
-    ))
-
-
 class SNMP(ApplicationSpecificProtocol):
     defaults = dict((
         LABEL('port 161'),
@@ -123,13 +116,6 @@ class DelegateOddjobExec(Delegate, OddjobExec):
     pass
 
 
-class DelegateRICCIRPC(Delegate, RICCIRPC):
-    pass
-
-
-class DelegateLuciHTTPS(Delegate, LuciHTTPS):
-    pass
-
 
 class DelegateSNMP(Delegate, SNMP):
     pass
-- 
cgit