Ravi Nori has uploaded a new change for review.

Change subject: tools : rhevm-manage-domains location option no longer valid 
(#871085)
......................................................................

tools : rhevm-manage-domains location option no longer valid (#871085)

In command line parameters for rhevm-manage-domains the -location 
(=remote/local)
parameter is an obsolete option but the command gives no error when added to the
command, and has no effect.

This also appears with -action=list, prints that the domain is remote, but all 
domains
are treated as "remote" so there is no point in printing that the domain is 
remote.

Change-Id: I3384c6981d38b03d2f2856ff8af69ac9d1c65056
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=871085
Signed-off-by: Ravi Nori <rn...@redhat.com>
---
M 
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java
1 file changed, 12 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/8963/1

diff --git 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java
 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java
index bd72938..765e12d 100644
--- 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java
+++ 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomains.java
@@ -67,7 +67,8 @@
         report,
         interactive,
         addPermissions,
-        provider
+        provider,
+        location
     }
 
     public enum ActionType {
@@ -378,11 +379,6 @@
 
             System.out.println("Domain: " + domain);
             System.out.println("\tUser name: " + userName);
-            if (authMode.equalsIgnoreCase(LdapAuthModeEnum.SIMPLE.name())) {
-                System.out.println("\tThis domain is a local domain.");
-            } else {
-                System.out.println("\tThis domain is a remote domain.");
-            }
         }
     }
 
@@ -890,23 +886,30 @@
                 if (actionType.equals(ActionType.add)) {
                     requireArgs(parser, Arguments.domain, Arguments.user, 
Arguments.provider);
                     requireAtLeastOneArg(parser, Arguments.passwordFile, 
Arguments.interactive);
+                    checkInvalidArgs(parser,
+                            Arguments.location);
                 } else if (actionType.equals(ActionType.edit)) {
                     requireArgs(parser, Arguments.domain);
+                    checkInvalidArgs(parser,
+                            Arguments.location);
                 } else if (actionType.equals(ActionType.delete)) {
                     requireArgs(parser, Arguments.domain);
+                    checkInvalidArgs(parser,
+                            Arguments.location);
                 } else if (actionType.equals(ActionType.validate)) {
                     checkInvalidArgs(parser,
                             Arguments.domain,
                             Arguments.user,
                             Arguments.passwordFile,
-                            Arguments.interactive);
-
+                            Arguments.interactive,
+                            Arguments.location);
                 } else if (actionType.equals(ActionType.list)) {
                     checkInvalidArgs(parser,
                             Arguments.domain,
                             Arguments.user,
                             Arguments.passwordFile,
-                            Arguments.interactive);
+                            Arguments.interactive,
+                            Arguments.location);
                 }
             } else {
                 throw new 
ManageDomainsResult(ManageDomainsResultEnum.ACTION_IS_NOT_SPECIFIED);


--
To view, visit http://gerrit.ovirt.org/8963
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3384c6981d38b03d2f2856ff8af69ac9d1c65056
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ravi Nori <rn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to