From 3743d182d99dbed9d2be84dc357f6839ffe4d2ec Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 18 Sep 2014 10:39:05 +0200
Subject: Hierarchical Roles. Fixes #199

---
 .../instance/predefined/agent/CreateAgentFromDescription.java         | 2 +-
 .../com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java | 2 +-
 .../c2kernel/lifecycle/instance/predefined/agent/SetAgentRoles.java   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined/agent')

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
index 520f70f..7683143 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java
@@ -57,7 +57,7 @@ public class CreateAgentFromDescription extends CreateItemFromDescription
         		throw new InvalidDataException("Agent should have at least one Role defined on creation");
         	// check if given roles exist
         	for(int i=1; i<input.length; i++) {
-            	RolePath thisRole = new RolePath(input[i]);
+            	RolePath thisRole = Gateway.getLookup().getRolePath(input[i]);
             	if (!thisRole.exists()) throw new InvalidDataException("Role "+input[i]+" does not exist");
             }
         	
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java
index 735a17d..8385453 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/RemoveAgent.java
@@ -36,7 +36,7 @@ public class RemoveAgent extends PredefinedStep {
 		//remove from roles
 		for (RolePath role: targetAgent.getRoles()) {
 			try {
-				role.removeAgent(targetAgent);
+				Gateway.getLookupManager().removeRole(targetAgent, role);
 			} catch (ObjectCannotBeUpdated e) {
 				Logger.error(e);
 				throw new InvalidDataException("Error removing "+agentName+" from Role "+role.getName(), "");
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentRoles.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentRoles.java
index 8cdcc49..0c2ed83 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentRoles.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/agent/SetAgentRoles.java
@@ -52,7 +52,7 @@ public class SetAgentRoles extends PredefinedStep {
 		// remove roles not in new list
 		for (RolePath roleToRemove : rolesToRemove)
 			try {
-				roleToRemove.removeAgent(targetAgent);
+				Gateway.getLookupManager().removeRole(targetAgent, roleToRemove);
 			} catch (Exception e) {
 				Logger.error(e);
 				throw new InvalidDataException("Error removing role "+roleToRemove.getName(), "");
@@ -61,7 +61,7 @@ public class SetAgentRoles extends PredefinedStep {
 		// add requested roles we don't already have
 		for (RolePath roleToAdd : requestedRoles)
 			try {
-				roleToAdd.addAgent(targetAgent);
+				Gateway.getLookupManager().addRole(targetAgent, roleToAdd);
 			} catch (Exception e) {
 				Logger.error(e);
 				throw new InvalidDataException("Error adding role "+roleToAdd.getName(), "");
-- 
cgit v1.2.3