shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

F #4714: Expose primary group query flag in OCA Java

Browse Source
This commit is contained in:
Ruben S. Montero 2016-10-04 10:53:27 +02:00
parent 7cbb9577e5
commit c1c61fe5c0
9 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/oca/java/src/org/opennebula/client/Pool.java
View File

@ -61,6 +61,11 @@ public abstract class Pool{
*/
public final static int MINE_GROUP = -1;
/**
* Resources owned by the user's primary group
*/
public final static int GROUP = -4;
/**
* Protected constructor, to be called from subclasses.
*
@ -73,7 +78,7 @@ public abstract class Pool{
this.elementName = elementName;
this.infoMethod = infoMethod;
this.client = client;
if(xpath == null)
{
XPathFactory factory = XPathFactory.newInstance();
@ -120,6 +125,11 @@ public abstract class Pool{
return xmlrpcInfo(client, infoMethod, MINE_GROUP, -1, -1);
}
protected static OneResponse infoGroupPrimary(Client client, String infoMethod)
{
return xmlrpcInfo(client, infoMethod, GROUP, -1, -1);
}
protected static OneResponse xmlrpcInfo(Client client, String infoMethod, Object...args)
{
return client.call(infoMethod, args);

2
src/oca/java/src/org/opennebula/client/document/DocumentPool.java
View File

@ -111,6 +111,7 @@ public abstract class DocumentPool extends Pool
* <li>{@link Pool#MINE}: Connected user's Documents</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Documents, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Documents</li>
* <li>&gt;= 0 UID User's Documents</li>
* </ul>
*/
@ -191,6 +192,7 @@ public abstract class DocumentPool extends Pool
* <li>{@link Pool#MINE}: Connected user's Documents</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Documents, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Documents</li>
* <li>&gt;= 0 UID User's Documents</li>
* </ul>
* @param startId Lowest Id to retrieve

4
src/oca/java/src/org/opennebula/client/image/ImagePool.java
View File

@ -61,6 +61,7 @@ public class ImagePool extends Pool implements Iterable<Image>
* <li>{@link Pool#MINE}: Connected user's Images</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Images, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Images</li>
* <li>&gt;= 0 UID User's Images</li>
* </ul>
*/
@ -89,6 +90,7 @@ public class ImagePool extends Pool implements Iterable<Image>
* <li>{@link Pool#MINE}: Connected user's Images</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Images, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Images</li>
* <li>&gt;= 0 UID User's Images</li>
* </ul>
* @return If successful the message contains the string
@ -147,6 +149,7 @@ public class ImagePool extends Pool implements Iterable<Image>
* <li>{@link Pool#MINE}: Connected user's Images</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Images, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Images</li>
* <li>&gt;= 0 UID User's Images</li>
* </ul>
* @param startId Lowest Id to retrieve
@ -219,6 +222,7 @@ public class ImagePool extends Pool implements Iterable<Image>
* <li>{@link Pool#MINE}: Connected user's Images</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Images, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Images</li>
* <li>&gt;= 0 UID User's Images</li>
* </ul>
* @param startId Lowest Id to retrieve

4
src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceAppPool.java
View File

@ -61,6 +61,7 @@ public class MarketPlaceAppPool extends Pool implements Iterable<MarketPlaceApp>
* <li>{@link Pool#MINE}: Connected user's MarketPlaceApps</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's MarketPlaceApps, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group MarketPlaceApps</li>
* <li>&gt;= 0 UID User's MarketPlaceApps</li>
* </ul>
*/
@ -89,6 +90,7 @@ public class MarketPlaceAppPool extends Pool implements Iterable<MarketPlaceApp>
* <li>{@link Pool#MINE}: Connected user's MarketPlaceApps</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's MarketPlaceApps, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group MarketPlaceApps</li>
* <li>&gt;= 0 UID User's MarketPlaceApps</li>
* </ul>
* @return If successful the message contains the string
@ -147,6 +149,7 @@ public class MarketPlaceAppPool extends Pool implements Iterable<MarketPlaceApp>
* <li>{@link Pool#MINE}: Connected user's MarketPlaceApps</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's MarketPlaceApps, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group MarketPlaceApps</li>
* <li>&gt;= 0 UID User's MarketPlaceApps</li>
* </ul>
* @param startId Lowest Id to retrieve
@ -219,6 +222,7 @@ public class MarketPlaceAppPool extends Pool implements Iterable<MarketPlaceApp>
* <li>{@link Pool#MINE}: Connected user's MarketPlaceApps</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's MarketPlaceApps, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group MarketPlaceApps</li>
* <li>&gt;= 0 UID User's MarketPlaceApps</li>
* </ul>
* @param startId Lowest Id to retrieve

4
src/oca/java/src/org/opennebula/client/secgroup/SecurityGroupPool.java
View File

@ -62,6 +62,7 @@ public class SecurityGroupPool extends Pool implements Iterable<SecurityGroup>{
* <li>{@link Pool#MINE}: Connected user's Security Groups</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Security Groups, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Security Groups</li>
* <li>&gt;= 0 UID User's Security Groups</li>
* </ul>
*/
@ -87,6 +88,7 @@ public class SecurityGroupPool extends Pool implements Iterable<SecurityGroup>{
* <li>{@link Pool#MINE}: Connected user's Security Groups</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Security Groups, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Security Groups</li>
* <li>&gt;= 0 UID User's Security Groups</li>
* </ul>
* @return If successful the message contains the string
@ -145,6 +147,7 @@ public class SecurityGroupPool extends Pool implements Iterable<SecurityGroup>{
* <li>{@link Pool#MINE}: Connected user's Security Groups</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Security Groups, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Security Groups</li>
* <li>&gt;= 0 UID User's Security Groups</li>
* </ul>
* @param startId Lowest Id to retrieve
@ -217,6 +220,7 @@ public class SecurityGroupPool extends Pool implements Iterable<SecurityGroup>{
* <li>{@link Pool#MINE}: Connected user's Security Groups</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Security Groups, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Security Groups</li>
* <li>&gt;= 0 UID User's Security Groups</li>
* </ul>
* @param startId Lowest Id to retrieve

7
src/oca/java/src/org/opennebula/client/template/TemplatePool.java
View File

@ -61,6 +61,7 @@ public class TemplatePool extends Pool implements Iterable<Template>
* <li>{@link Pool#MINE}: Connected user's Templates</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Templates, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Templates</li>
* <li>&gt;= 0: UID User's Templates</li>
* </ul>
*/
@ -89,6 +90,8 @@ public class TemplatePool extends Pool implements Iterable<Template>
* <li>{@link Pool#MINE}: Connected user's Templates</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Templates, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Templates</li>
* <li>&gt;= 0: UID User's Templates</li>
* <li>&gt;= 0: UID User's Templates</li>
* </ul>
* @return If successful the message contains the string
@ -147,6 +150,8 @@ public class TemplatePool extends Pool implements Iterable<Template>
* <li>{@link Pool#MINE}: Connected user's Templates</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Templates, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Templates</li>
* <li>&gt;= 0: UID User's Templates</li>
* <li>&gt;= 0: UID User's Templates</li>
* </ul>
* @param startId Lowest Id to retrieve
@ -219,6 +224,8 @@ public class TemplatePool extends Pool implements Iterable<Template>
* <li>{@link Pool#MINE}: Connected user's Templates</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Templates, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Templates</li>
* <li>&gt;= 0: UID User's Templates</li>
* <li>&gt;= 0: UID User's Templates</li>
* </ul>
* @param startId Lowest Id to retrieve

6
src/oca/java/src/org/opennebula/client/vm/VirtualMachinePool.java
View File

@ -73,6 +73,7 @@ public class VirtualMachinePool extends Pool implements Iterable<VirtualMachine>
* <li>{@link Pool#MINE}: Connected user's Virtual Machines</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Virtual Machines, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Virtual Machines</li>
* <li>&gt;= 0 UID User's Virtual Machines</li>
* </ul>
*/
@ -99,6 +100,7 @@ public class VirtualMachinePool extends Pool implements Iterable<VirtualMachine>
* <li>{@link Pool#MINE}: Connected user's Virtual Machines</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Virtual Machines, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Virtual Machines</li>
* <li>&gt;= 0 UID User's Virtual Machines</li>
* </ul>
* @return If successful the message contains the string
@ -158,6 +160,7 @@ public class VirtualMachinePool extends Pool implements Iterable<VirtualMachine>
* <li>{@link Pool#MINE}: Connected user's Virtual Machines</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Virtual Machines, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Virtual Machines</li>
* <li>&gt;= 0 UID User's Virtual Machines</li>
* </ul>
* @param startId Lowest Id to retrieve
@ -185,6 +188,7 @@ public class VirtualMachinePool extends Pool implements Iterable<VirtualMachine>
* <li>{@link Pool#MINE}: Connected user's Virtual Machines</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Virtual Machines, and
* the ones in his group</li>
* <li>{@link Pool#GROUP}: User's primary group Virtual Machines</li>
* <li>&gt;= 0 UID User's Virtual Machines</li>
* </ul>
* @return If successful the message contains the string
@ -262,6 +266,7 @@ public class VirtualMachinePool extends Pool implements Iterable<VirtualMachine>
* <li>{@link Pool#MINE}: Connected user's Virtual Machines</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Virtual Machines, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Virtual Machines</li>
* <li>&gt;= 0 UID User's Virtual Machines</li>
* </ul>
* @param startId Lowest Id to retrieve
@ -287,6 +292,7 @@ public class VirtualMachinePool extends Pool implements Iterable<VirtualMachine>
* <li>{@link Pool#MINE}: Connected user's Virtual Machines</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Virtual Machines, and
* the ones in his group</li>
* <li>{@link Pool#GROUP}: User's primary group Virtual Machines</li>
* <li>&gt;= 0 UID User's Virtual Machines</li>
* </ul>
* @return If successful the message contains the string

4
src/oca/java/src/org/opennebula/client/vnet/VirtualNetworkPool.java
View File

@ -62,6 +62,7 @@ public class VirtualNetworkPool extends Pool implements Iterable<VirtualNetwork>
* <li>{@link Pool#MINE}: Connected user's Virtual Networks</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Virtual Networks, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Virtual Networks</li>
* <li>&gt;= 0 UID User's Virtual Networks</li>
* </ul>
*/
@ -87,6 +88,7 @@ public class VirtualNetworkPool extends Pool implements Iterable<VirtualNetwork>
* <li>{@link Pool#MINE}: Connected user's Virtual Networks</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Virtual Networks, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Virtual Networks</li>
* <li>&gt;= 0 UID User's Virtual Networks</li>
* </ul>
* @return If successful the message contains the string
@ -145,6 +147,7 @@ public class VirtualNetworkPool extends Pool implements Iterable<VirtualNetwork>
* <li>{@link Pool#MINE}: Connected user's Virtual Networks</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Virtual Networks, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Virtual Networks</li>
* <li>&gt;= 0 UID User's Virtual Networks</li>
* </ul>
* @param startId Lowest Id to retrieve
@ -217,6 +220,7 @@ public class VirtualNetworkPool extends Pool implements Iterable<VirtualNetwork>
* <li>{@link Pool#MINE}: Connected user's Virtual Networks</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's Virtual Networks, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group Virtual Networks</li>
* <li>&gt;= 0 UID User's Virtual Networks</li>
* </ul>
* @param startId Lowest Id to retrieve

4
src/oca/java/src/org/opennebula/client/vrouter/VirtualRouterPool.java
View File

@ -61,6 +61,7 @@ public class VirtualRouterPool extends Pool implements Iterable<VirtualRouter>
* <li>{@link Pool#MINE}: Connected user's VirtualRouters</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's VirtualRouters, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group VirtualRouters</li>
* <li>&gt;= 0 UID User's VirtualRouters</li>
* </ul>
*/
@ -89,6 +90,7 @@ public class VirtualRouterPool extends Pool implements Iterable<VirtualRouter>
* <li>{@link Pool#MINE}: Connected user's VirtualRouters</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's VirtualRouters, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group VirtualRouters</li>
* <li>&gt;= 0 UID User's VirtualRouters</li>
* </ul>
* @return If successful the message contains the string
@ -147,6 +149,7 @@ public class VirtualRouterPool extends Pool implements Iterable<VirtualRouter>
* <li>{@link Pool#MINE}: Connected user's VirtualRouters</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's VirtualRouters, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group VirtualRouters</li>
* <li>&gt;= 0 UID User's VirtualRouters</li>
* </ul>
* @param startId Lowest Id to retrieve
@ -219,6 +222,7 @@ public class VirtualRouterPool extends Pool implements Iterable<VirtualRouter>
* <li>{@link Pool#MINE}: Connected user's VirtualRouters</li>
* <li>{@link Pool#MINE_GROUP}: Connected user's VirtualRouters, and the ones in
* his group</li>
* <li>{@link Pool#GROUP}: User's primary group VirtualRouters</li>
* <li>&gt;= 0 UID User's VirtualRouters</li>
* </ul>
* @param startId Lowest Id to retrieve