First code for machines groups.

portnov [2009-02-24 19:33:26]
First code for machines groups.
Filename
data.py
machines.py
test.py
diff --git a/data.py b/data.py
index cdbf532..66c45ae 100644
--- a/data.py
+++ b/data.py
@@ -18,11 +18,4 @@ class Service(object):
     def __repr__(self):
         return "<Service %s on %s:%s>" % (self.name,self.ip,self.port)

-class Host(object):
-    def __init__(self):
-        self.ip = ''
-        self.hostname = ''
-
-    def __repr__(self):
-        return "<Host %s>" % self.hostname

diff --git a/machines.py b/machines.py
new file mode 100644
index 0000000..54e1bc7
--- /dev/null
+++ b/machines.py
@@ -0,0 +1,18 @@
+
+class Host(object):
+    def __init__(self):
+        self.ip = ''
+        self.hostname = ''
+
+    def __repr__(self):
+        return "<Host %s>" % self.hostname
+
+class MachinesGroup(object):
+    def __init__(self,name,*args):
+        self.name = name
+        self.machines = args
+
+    def __repr__(self):
+        return "<Group %s (%d machines)>" % (self.name, len(self.machines))
+
+
diff --git a/test.py b/test.py
index 7869850..1d8f55d 100755
--- a/test.py
+++ b/test.py
@@ -8,7 +8,7 @@ import discovery
 import templates
 import configs
 import configsets
-from data import Service, Host
+import data

 # import xmlserialize as XML

@@ -28,14 +28,14 @@ class ZeroconfListener(object):
         global hosts

         if stype == '_workstation._tcp':
-            host = Host()
+            host = data.Host()
             host.hostname = name.split()[0]
             host.ip = addr
             hosts.append(host)
             return

         sname = discovery.servicenames[stype]
-        svc = Service()
+        svc = data.Service()
         svc.name = name
         svc.ip = addr
         svc.port = port
@@ -53,13 +53,13 @@ browser.start()
 hosts = []

 services = {}
-services['proxy'] = Service()
+services['proxy'] = data.Service()
 services['proxy'].ip = '192.168.32.3'
 services['proxy'].port = 3128
-services['gateway'] = Service()
+services['gateway'] = data.Service()
 services['gateway'].ip = '192.168.32.1'

-machine = Host()
+machine = data.Host()
 machine.ip = '192.168.1.2'
 machine.hostname = 'portnov'
ViewGit