From: Andy Bavier <acb@cs.princeton.edu>
Date: Mon, 12 Oct 2009 15:40:45 +0000 (+0000)
Subject: Don't show peer sites in RSpec
X-Git-Tag: sfa-0.9-6~199
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=055366b0ce962e8fe8f332cded03b777f6b81191;p=sfa.git

Don't show peer sites in RSpec
---

diff --git a/sfa/rspecs/aggregates/vini/utils.py b/sfa/rspecs/aggregates/vini/utils.py
index 98455003..c5fa4dc1 100644
--- a/sfa/rspecs/aggregates/vini/utils.py
+++ b/sfa/rspecs/aggregates/vini/utils.py
@@ -219,6 +219,7 @@ class Site:
         self.name = site['abbreviated_name'].replace(" ", "_")
         self.tag = site['login_base']
         self.public = site['is_public']
+        self.enabled = site['enabled']
         self.links = set()
 
     def get_sitenodes(self, nodes):
@@ -564,7 +565,7 @@ class Topology:
         <NetSpec name="physical_topology">"""
 
         for site in self.getSites():
-            if not site.public:
+            if not (site.public and site.enabled):
                 continue
             
             xml += """