Merge pull request #2308 from zlamalp/sponsor

CLI: Support SPONSOR role in setRole/unsetRole tools

Author: zlamalp

perun-cli/Perun/VosAgent.pm

@@ -83,4 +83,13 @@ sub getRichAdminsWithAttributes
 	return Perun::Common::callManagerMethod('getRichAdminsWithAttributes', '[]RichUser', @_);
 }
 
+sub addSponsorRole
+{
+	return Perun::Common::callManagerMethod('addSponsorRole', 'null', @_);
+}
+sub removeSponsorRole
+{
+	return Perun::Common::callManagerMethod('removeSponsorRole', 'null', @_);
+}
+
 1;

perun-cli/setRole

@@ -104,10 +104,18 @@ if ($role eq "PERUNADMIN") {
 		my $vosAgent = $agent->getVosAgent;
 		my $vo = $vosAgent->getVoById( id => $voId );
 		if (defined($userId)) {
-			$authzResolverAgent->setRole( user => $userId, complementaryObject => $vo, role => $role );
+			if ("SPONSOR" eq $role) {
+				$vosAgent->addSponsorRole( user => $userId, vo => $vo->getId());
+			} else {
+				$authzResolverAgent->setRole( user => $userId, complementaryObject => $vo, role => $role );
+			}
 			printMessage("$role role is successfully set for user $userId and VO $voId", $batch);
 		} else {
-			$authzResolverAgent->setRole( authorizedGroup => $authorizedGroupId, complementaryObject => $vo, role => $role );
+			if ("SPONSOR" eq $role) {
+				$vosAgent->addSponsorRole( authorizedGroup => $authorizedGroupId, vo => $vo->getId());
+			} else {
+				$authzResolverAgent->setRole( authorizedGroup => $authorizedGroupId, complementaryObject => $vo, role => $role );
+			}
 			printMessage("$role role is successfully set for authorizedGroup $authorizedGroupId and VO $voId", $batch);
 		}
 	#resource

perun-cli/unsetRole

@@ -104,10 +104,19 @@ if ($role eq "PERUNADMIN") {
 		my $vosAgent = $agent->getVosAgent;
 		my $vo = $vosAgent->getVoById( id => $voId );
 		if (defined($userId)) {
-			$authzResolverAgent->unsetRole( user => $userId, complementaryObject => $vo, role => $role );
+			if ("SPONSOR" eq $role) {
+				$vosAgent->removeSponsorRole( user => $userId, vo => $vo->getId());
+			} else {
+				$authzResolverAgent->unsetRole( user => $userId, complementaryObject => $vo, role => $role );
+			}
 			printMessage("$role role was removed from user $userId and VO $voId", $batch);
 		} else {
-			$authzResolverAgent->unsetRole( authorizedGroup => $authorizedGroupId, complementaryObject => $vo, role => $role );
+			if ("SPONSOR" eq $role) {
+				$vosAgent->removeSponsorRole( authorizedGroup => $authorizedGroupId, vo => $vo->getId());
+			} else {
+				$authzResolverAgent->unsetRole( authorizedGroup => $authorizedGroupId, complementaryObject => $vo, role => $role );
+			}
+
 			printMessage("$role role was removed from authorizedGroup $authorizedGroupId and VO $voId", $batch);
 		}
 	#resource