From fe91583bf1f709381a92e2d4040d55804ffef105 Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Thu, 15 Oct 2009 17:44:09 +0000 Subject: [PATCH] Rspec to RSpec --- sfa/rspecs/aggregates/vini/rspec.py | 10 +++++----- sfa/rspecs/aggregates/vini/utils.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sfa/rspecs/aggregates/vini/rspec.py b/sfa/rspecs/aggregates/vini/rspec.py index 9ee36028..12b7b449 100644 --- a/sfa/rspecs/aggregates/vini/rspec.py +++ b/sfa/rspecs/aggregates/vini/rspec.py @@ -38,8 +38,8 @@ class ViniRspec(Rspec): sldict['bw'] = [format_tc_rate(sl.bps)] sitelinkspecs.append(sldict) - d['Rspec']['Capacity'][0]['NetSpec'][0]['SiteSpec'] = sitespecs - d['Rspec']['Capacity'][0]['NetSpec'][0]['SiteLinkSpec'] = sitelinkspecs + d['RSpec']['Capacity'][0]['NetSpec'][0]['SiteSpec'] = sitespecs + d['RSpec']['Capacity'][0]['NetSpec'][0]['SiteLinkSpec'] = sitelinkspecs self.parseDict(d) @@ -52,6 +52,6 @@ class ViniRspec(Rspec): linkspecs.append(edict) d = self.toDict() - d['Rspec']['Request'][0]['NetSpec'][0]['LinkSpec'] = linkspecs - d['Rspec']['Request'][0]['NetSpec'][0]['name'] = slice.hrn - self.parseDict(d) \ No newline at end of file + d['RSpec']['Request'][0]['NetSpec'][0]['LinkSpec'] = linkspecs + d['RSpec']['Request'][0]['NetSpec'][0]['name'] = slice.hrn + self.parseDict(d) diff --git a/sfa/rspecs/aggregates/vini/utils.py b/sfa/rspecs/aggregates/vini/utils.py index c5fa4dc1..e67e0417 100644 --- a/sfa/rspecs/aggregates/vini/utils.py +++ b/sfa/rspecs/aggregates/vini/utils.py @@ -490,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]] -- 2.47.0