Rspec to RSpec

[sfa.git] / sfa / rspecs / aggregates / vini / utils.py

diff --git a/sfa/rspecs/aggregates/vini/utils.py b/sfa/rspecs/aggregates/vini/utils.py
index 9845500..e67e041 100644 (file)
--- 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):
@@ -489,7 +490,7 @@ class Topology:
         for node in self.getNodes():
             nodedict[node.tag] = node
             
-        linkspecs = rspecdict['Rspec']['Request'][0]['NetSpec'][0]['LinkSpec']    
+        linkspecs = rspecdict['RSpec']['Request'][0]['NetSpec'][0]['LinkSpec']    
         for l in linkspecs:
             n1 = nodedict[l['endpoint'][0]]
             n2 = nodedict[l['endpoint'][1]]
@@ -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 += """