From c1c61fe5c07389dacbd3f7f61cd2f172cff47452 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Tue, 4 Oct 2016 10:53:27 +0200 Subject: [PATCH] F #4714: Expose primary group query flag in OCA Java --- src/oca/java/src/org/opennebula/client/Pool.java | 12 +++++++++++- .../org/opennebula/client/document/DocumentPool.java | 2 ++ .../src/org/opennebula/client/image/ImagePool.java | 4 ++++ .../client/marketplaceapp/MarketPlaceAppPool.java | 4 ++++ .../client/secgroup/SecurityGroupPool.java | 4 ++++ .../org/opennebula/client/template/TemplatePool.java | 7 +++++++ .../org/opennebula/client/vm/VirtualMachinePool.java | 6 ++++++ .../opennebula/client/vnet/VirtualNetworkPool.java | 4 ++++ .../opennebula/client/vrouter/VirtualRouterPool.java | 4 ++++ 9 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/oca/java/src/org/opennebula/client/Pool.java b/src/oca/java/src/org/opennebula/client/Pool.java index 7d4a7fd62d..5e36fadeda 100644 --- a/src/oca/java/src/org/opennebula/client/Pool.java +++ b/src/oca/java/src/org/opennebula/client/Pool.java @@ -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); diff --git a/src/oca/java/src/org/opennebula/client/document/DocumentPool.java b/src/oca/java/src/org/opennebula/client/document/DocumentPool.java index 04ff054f72..bc8d3073c6 100644 --- a/src/oca/java/src/org/opennebula/client/document/DocumentPool.java +++ b/src/oca/java/src/org/opennebula/client/document/DocumentPool.java @@ -111,6 +111,7 @@ public abstract class DocumentPool extends Pool *
  • {@link Pool#MINE}: Connected user's Documents
    • *
  • {@link Pool#MINE_GROUP}: Connected user's Documents, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Documents
    • *
  • >= 0 UID User's Documents
    • * */ @@ -191,6 +192,7 @@ public abstract class DocumentPool extends Pool *
  • {@link Pool#MINE}: Connected user's Documents
    • *
  • {@link Pool#MINE_GROUP}: Connected user's Documents, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Documents
    • *
  • >= 0 UID User's Documents
    • * * @param startId Lowest Id to retrieve diff --git a/src/oca/java/src/org/opennebula/client/image/ImagePool.java b/src/oca/java/src/org/opennebula/client/image/ImagePool.java index d2b72bb166..80041222e8 100644 --- a/src/oca/java/src/org/opennebula/client/image/ImagePool.java +++ b/src/oca/java/src/org/opennebula/client/image/ImagePool.java @@ -61,6 +61,7 @@ public class ImagePool extends Pool implements Iterable *
  • {@link Pool#MINE}: Connected user's Images
    • *
  • {@link Pool#MINE_GROUP}: Connected user's Images, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Images
    • *
  • >= 0 UID User's Images
    • * */ @@ -89,6 +90,7 @@ public class ImagePool extends Pool implements Iterable *
  • {@link Pool#MINE}: Connected user's Images
    • *
  • {@link Pool#MINE_GROUP}: Connected user's Images, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Images
    • *
  • >= 0 UID User's Images
    • * * @return If successful the message contains the string @@ -147,6 +149,7 @@ public class ImagePool extends Pool implements Iterable *
  • {@link Pool#MINE}: Connected user's Images
    • *
  • {@link Pool#MINE_GROUP}: Connected user's Images, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Images
    • *
  • >= 0 UID User's Images
    • * * @param startId Lowest Id to retrieve @@ -219,6 +222,7 @@ public class ImagePool extends Pool implements Iterable *
  • {@link Pool#MINE}: Connected user's Images
    • *
  • {@link Pool#MINE_GROUP}: Connected user's Images, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Images
    • *
  • >= 0 UID User's Images
    • * * @param startId Lowest Id to retrieve diff --git a/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceAppPool.java b/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceAppPool.java index 8c7ac967a0..45e7f99302 100644 --- a/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceAppPool.java +++ b/src/oca/java/src/org/opennebula/client/marketplaceapp/MarketPlaceAppPool.java @@ -61,6 +61,7 @@ public class MarketPlaceAppPool extends Pool implements Iterable *
  • {@link Pool#MINE}: Connected user's MarketPlaceApps
    • *
  • {@link Pool#MINE_GROUP}: Connected user's MarketPlaceApps, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group MarketPlaceApps
    • *
  • >= 0 UID User's MarketPlaceApps
    • * */ @@ -89,6 +90,7 @@ public class MarketPlaceAppPool extends Pool implements Iterable *
  • {@link Pool#MINE}: Connected user's MarketPlaceApps
    • *
  • {@link Pool#MINE_GROUP}: Connected user's MarketPlaceApps, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group MarketPlaceApps
    • *
  • >= 0 UID User's MarketPlaceApps
    • * * @return If successful the message contains the string @@ -147,6 +149,7 @@ public class MarketPlaceAppPool extends Pool implements Iterable *
  • {@link Pool#MINE}: Connected user's MarketPlaceApps
    • *
  • {@link Pool#MINE_GROUP}: Connected user's MarketPlaceApps, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group MarketPlaceApps
    • *
  • >= 0 UID User's MarketPlaceApps
    • * * @param startId Lowest Id to retrieve @@ -219,6 +222,7 @@ public class MarketPlaceAppPool extends Pool implements Iterable *
  • {@link Pool#MINE}: Connected user's MarketPlaceApps
    • *
  • {@link Pool#MINE_GROUP}: Connected user's MarketPlaceApps, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group MarketPlaceApps
    • *
  • >= 0 UID User's MarketPlaceApps
    • * * @param startId Lowest Id to retrieve diff --git a/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroupPool.java b/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroupPool.java index 4b766fb2f9..665cab8b9a 100644 --- a/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroupPool.java +++ b/src/oca/java/src/org/opennebula/client/secgroup/SecurityGroupPool.java @@ -62,6 +62,7 @@ public class SecurityGroupPool extends Pool implements Iterable{ *
  • {@link Pool#MINE}: Connected user's Security Groups
    • *
  • {@link Pool#MINE_GROUP}: Connected user's Security Groups, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Security Groups
    • *
  • >= 0 UID User's Security Groups
    • * */ @@ -87,6 +88,7 @@ public class SecurityGroupPool extends Pool implements Iterable{ *
  • {@link Pool#MINE}: Connected user's Security Groups
    • *
  • {@link Pool#MINE_GROUP}: Connected user's Security Groups, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Security Groups
    • *
  • >= 0 UID User's Security Groups
    • * * @return If successful the message contains the string @@ -145,6 +147,7 @@ public class SecurityGroupPool extends Pool implements Iterable{ *
  • {@link Pool#MINE}: Connected user's Security Groups
    • *
  • {@link Pool#MINE_GROUP}: Connected user's Security Groups, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Security Groups
    • *
  • >= 0 UID User's Security Groups
    • * * @param startId Lowest Id to retrieve @@ -217,6 +220,7 @@ public class SecurityGroupPool extends Pool implements Iterable{ *
  • {@link Pool#MINE}: Connected user's Security Groups
    • *
  • {@link Pool#MINE_GROUP}: Connected user's Security Groups, and the ones in * his group
    • + *
  • {@link Pool#GROUP}: User's primary group Security Groups
    • *
  • >= 0 UID User's Security Groups
    • * * @param startId Lowest Id to retrieve diff --git a/src/oca/java/src/org/opennebula/client/template/TemplatePool.java b/src/oca/java/src/org/opennebula/client/template/TemplatePool.java index 06b5b92198..3c2ad43fcf 100644 --- a/src/oca/java/src/org/opennebula/client/template/TemplatePool.java +++ b/src/oca/java/src/org/opennebula/client/template/TemplatePool.java @@ -61,6 +61,7 @@ public class TemplatePool extends Pool implements Iterable