From d87a02a689fa091a0299797c32031f9538af311d Mon Sep 17 00:00:00 2001
From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Tue, 28 May 2013 12:16:17 +0200
Subject: [PATCH] Replace RSpec elements Node and Services in v2 drivers by
NodeElement and ServicesElement
---
sfa/dummy/dummyaggregate.py | 8 ++++----
sfa/nitos/nitosaggregate.py | 2 +-
sfa/senslab/slabaggregate.py | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sfa/dummy/dummyaggregate.py b/sfa/dummy/dummyaggregate.py
index 99127d73..4630033f 100644
--- a/sfa/dummy/dummyaggregate.py
+++ b/sfa/dummy/dummyaggregate.py
@@ -5,13 +5,13 @@ from sfa.util.sfalogging import logger
from sfa.rspecs.rspec import RSpec
from sfa.rspecs.elements.hardware_type import HardwareType
-from sfa.rspecs.elements.node import Node
+from sfa.rspecs.elements.node import NodeElement
from sfa.rspecs.elements.link import Link
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.login import Login
from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.interface import Interface
-from sfa.rspecs.elements.services import Services
+from sfa.rspecs.elements.services import ServicesElement
from sfa.rspecs.elements.pltag import PLTag
from sfa.rspecs.elements.lease import Lease
from sfa.rspecs.elements.granularity import Granularity
@@ -66,7 +66,7 @@ class DummyAggregate:
rspec_nodes = []
for node in nodes:
- rspec_node = Node()
+ rspec_node = NodeElement()
# xxx how to retrieve site['login_base']
site=self.driver.testbedInfo
rspec_node['component_id'] = hostname_to_urn(self.driver.hrn, site['name'], node['hostname'])
@@ -90,7 +90,7 @@ class DummyAggregate:
# slivers always provide the ssh service
login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], 'port':'22', 'username': slice['slice_name']})
- service = Services({'login': login})
+ service = ServicesElement({'login': login})
rspec_node['services'] = [service]
rspec_nodes.append(rspec_node)
return rspec_nodes
diff --git a/sfa/nitos/nitosaggregate.py b/sfa/nitos/nitosaggregate.py
index 742d45bb..2e59d2e0 100644
--- a/sfa/nitos/nitosaggregate.py
+++ b/sfa/nitos/nitosaggregate.py
@@ -86,7 +86,7 @@ class NitosAggregate:
rspec_nodes = []
for node in nodes:
- rspec_node = Node()
+ rspec_node = NodeElement()
site_name = self.driver.testbedInfo['name']
rspec_node['component_id'] = hostname_to_urn(self.driver.hrn, site_name, node['hostname'])
rspec_node['component_name'] = node['hostname']
diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py
index c31b32b4..9885a83b 100644
--- a/sfa/senslab/slabaggregate.py
+++ b/sfa/senslab/slabaggregate.py
@@ -5,7 +5,7 @@ from sfa.rspecs.rspec import RSpec
#from sfa.rspecs.elements.location import Location
from sfa.rspecs.elements.hardware_type import HardwareType
from sfa.rspecs.elements.login import Login
-from sfa.rspecs.elements.services import Services
+from sfa.rspecs.elements.services import ServicesElement
from sfa.rspecs.elements.sliver import Sliver
from sfa.rspecs.elements.lease import Lease
from sfa.rspecs.elements.granularity import Granularity
@@ -258,7 +258,7 @@ class SlabAggregate:
# slivers always provide the ssh service
login = Login({'authentication': 'ssh-keys', 'hostname': node['hostname'], 'port':'22', 'username': sliver['name']})
- service = Services({'login': login})
+ service = ServicesElement({'login': login})
rspec_node['services'] = [service]
rspec_nodes.append(rspec_node)
--
2.47.0