geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jensde...@apache.org
Subject [1/3] incubator-geode git commit: GEODE-17: Reduce nouns and verbs for WanCommands
Date Fri, 01 Apr 2016 14:05:22 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-17-2 0ba41deee -> 65635fe4d


GEODE-17: Reduce nouns and verbs for WanCommands

- Nouns are now just GATEWAY
- Verbs are MANAGE and LIST


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7f0310e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7f0310e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7f0310e7

Branch: refs/heads/feature/GEODE-17-2
Commit: 7f0310e74b38844c7f5ca881fecf05b82882dd6b
Parents: 0ba41de
Author: Jens Deppe <jdeppe@pivotal.io>
Authored: Thu Mar 31 10:49:30 2016 -0700
Committer: Jens Deppe <jdeppe@pivotal.io>
Committed: Thu Mar 31 11:40:43 2016 -0700

----------------------------------------------------------------------
 .../cache/operations/OperationContext.java      |  3 +--
 .../management/GatewayReceiverMXBean.java       |  4 +--
 .../gemfire/management/GatewaySenderMXBean.java | 10 ++++----
 .../internal/cli/commands/WanCommands.java      | 24 ++++++++---------
 .../GatewayReceiverMBeanSecurityTest.java       |  4 +--
 .../GatewaySenderMBeanSecurityTest.java         | 10 ++++----
 .../security/WanCommandsSecurityTest.java       | 27 ++++++++++++--------
 .../internal/security/cacheServer.json          | 20 +++------------
 8 files changed, 47 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7f0310e7/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
index 9e56632..d0a37a6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/OperationContext.java
@@ -40,8 +40,7 @@ public abstract class OperationContext {
     DISKSTORE_OFFLINE,
     DISTRIBUTED_SYSTEM,
     FUNCTION,
-    GATEWAY_RECEIVER,
-    GATEWAY_SENDER,
+    GATEWAY,
     INDEX,
     JMX,
     LOCATOR,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7f0310e7/geode-core/src/main/java/com/gemstone/gemfire/management/GatewayReceiverMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/GatewayReceiverMXBean.java
b/geode-core/src/main/java/com/gemstone/gemfire/management/GatewayReceiverMXBean.java
index 317be87..9b52300 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/GatewayReceiverMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/GatewayReceiverMXBean.java
@@ -92,13 +92,13 @@ public interface GatewayReceiverMXBean {
   /**
    * Starts the gateway receiver.
    */
-  @ResourceOperation(resource = Resource.GATEWAY_RECEIVER, operation = OperationCode.START)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public void start() throws Exception;
 
   /**
    * Stops the gateway receiver.
    */
-  @ResourceOperation(resource = Resource.GATEWAY_RECEIVER, operation = OperationCode.STOP)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public void stop() throws Exception;
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7f0310e7/geode-core/src/main/java/com/gemstone/gemfire/management/GatewaySenderMXBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/GatewaySenderMXBean.java
b/geode-core/src/main/java/com/gemstone/gemfire/management/GatewaySenderMXBean.java
index 2340119..c50b4d3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/GatewaySenderMXBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/GatewaySenderMXBean.java
@@ -175,31 +175,31 @@ public interface GatewaySenderMXBean {
    * configuration cannot be changed.
    * 
    */
-  @ResourceOperation(resource = Resource.GATEWAY_SENDER, operation = OperationCode.START)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public void start();
 
   /**
    * Stops this GatewaySender.
    */
-  @ResourceOperation(resource=Resource.GATEWAY_SENDER, operation=OperationCode.STOP)
+  @ResourceOperation(resource=Resource.GATEWAY, operation=OperationCode.MANAGE)
   public void stop();
 
   /**
    * Pauses this GatewaySender.
    */
-  @ResourceOperation(resource = Resource.GATEWAY_SENDER, operation = OperationCode.PAUSE)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public void pause();
 
   /**
    * Resumes this paused GatewaySender.
    */
-  @ResourceOperation(resource = Resource.GATEWAY_SENDER, operation = OperationCode.RESUME)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public void resume();
 
   /**
    * Rebalances this GatewaySender.
    */
-  @ResourceOperation(resource = Resource.GATEWAY_SENDER, operation = OperationCode.REBALANCE)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public void rebalance();
   
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7f0310e7/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/WanCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/WanCommands.java
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/WanCommands.java
index c847618..197e3e2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/WanCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/WanCommands.java
@@ -76,7 +76,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.CREATE_GATEWAYSENDER, help = CliStrings.CREATE_GATEWAYSENDER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN, writesToSharedConfiguration=true)
-  @ResourceOperation(resource = Resource.GATEWAY_SENDER, operation = OperationCode.CREATE)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public Result createGatewaySender(
       @CliOption(key = CliStrings.CREATE_GATEWAYSENDER__GROUP,
       optionContext = ConverterHint.MEMBERGROUP,
@@ -193,7 +193,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.START_GATEWAYSENDER, help = CliStrings.START_GATEWAYSENDER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation(resource = Resource.GATEWAY_SENDER, operation = OperationCode.START)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public Result startGatewaySender(
       @CliOption(key = CliStrings.START_GATEWAYSENDER__ID,
       mandatory = true,
@@ -336,7 +336,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.PAUSE_GATEWAYSENDER, help = CliStrings.PAUSE_GATEWAYSENDER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation(resource = Resource.GATEWAY_SENDER, operation = OperationCode.PAUSE)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public Result pauseGatewaySender(
       @CliOption(key = CliStrings.PAUSE_GATEWAYSENDER__ID,
       mandatory = true,
@@ -429,7 +429,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.RESUME_GATEWAYSENDER, help = CliStrings.RESUME_GATEWAYSENDER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation(resource=Resource.GATEWAY_SENDER, operation = OperationCode.RESUME)
+  @ResourceOperation(resource=Resource.GATEWAY, operation = OperationCode.MANAGE)
   public Result resumeGatewaySender(
       @CliOption(key = CliStrings.RESUME_GATEWAYSENDER__ID,
       mandatory = true,
@@ -569,7 +569,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.STOP_GATEWAYSENDER, help = CliStrings.STOP_GATEWAYSENDER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation(resource = Resource.GATEWAY_SENDER, operation = OperationCode.STOP)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public Result stopGatewaySender(
       @CliOption(key = CliStrings.STOP_GATEWAYSENDER__ID,
       mandatory = true,
@@ -645,7 +645,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.CREATE_GATEWAYRECEIVER, help = CliStrings.CREATE_GATEWAYRECEIVER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation( resource=Resource.GATEWAY_RECEIVER, operation = OperationCode.CREATE)
+  @ResourceOperation( resource=Resource.GATEWAY, operation = OperationCode.MANAGE)
   public Result createGatewayReceiver(
       @CliOption(key = CliStrings.CREATE_GATEWAYRECEIVER__GROUP,
       optionContext = ConverterHint.MEMBERGROUP,
@@ -725,7 +725,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.LOAD_BALANCE_GATEWAYSENDER, help = CliStrings.LOAD_BALANCE_GATEWAYSENDER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation(resource = Resource.GATEWAY_SENDER, operation = OperationCode.REBALANCE)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public Result loadBalanceGatewaySender(
       @CliOption(key = CliStrings.LOAD_BALANCE_GATEWAYSENDER__ID,
       mandatory = true,
@@ -791,7 +791,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.START_GATEWAYRECEIVER, help = CliStrings.START_GATEWAYRECEIVER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation(resource = Resource.GATEWAY_RECEIVER, operation = OperationCode.START)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public Result startGatewayReceiver(
       @CliOption(key = CliStrings.START_GATEWAYRECEIVER__GROUP,
       optionContext = ConverterHint.MEMBERGROUP,
@@ -853,7 +853,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.STOP_GATEWAYRECEIVER, help = CliStrings.STOP_GATEWAYRECEIVER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation(resource = Resource.GATEWAY_RECEIVER, operation = OperationCode.STOP)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.MANAGE)
   public Result stopGatewayReceiver(
 
       @CliOption(key = CliStrings.STOP_GATEWAYRECEIVER__GROUP,
@@ -927,7 +927,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.LIST_GATEWAY, help = CliStrings.LIST_GATEWAY__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation(resource = Resource.DISTRIBUTED_SYSTEM, operation = OperationCode.LIST)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.LIST)
   public Result listGateway(
       @CliOption(key = CliStrings.LIST_GATEWAY__MEMBER,
       optionContext = ConverterHint.MEMBERIDNAME,
@@ -1018,7 +1018,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.STATUS_GATEWAYSENDER, help = CliStrings.STATUS_GATEWAYSENDER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation(resource = Resource.DISTRIBUTED_SYSTEM, operation = OperationCode.STATUS)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.LIST)
   public Result statusGatewaySender(
       @CliOption(key = CliStrings.STATUS_GATEWAYSENDER__ID,
       mandatory = true,
@@ -1085,7 +1085,7 @@ public class WanCommands implements CommandMarker {
 
   @CliCommand(value = CliStrings.STATUS_GATEWAYRECEIVER, help = CliStrings.STATUS_GATEWAYRECEIVER__HELP)
   @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
-  @ResourceOperation(resource = Resource.GATEWAY_RECEIVER, operation = OperationCode.STATUS)
+  @ResourceOperation(resource = Resource.GATEWAY, operation = OperationCode.LIST)
   public Result statusGatewayReceiver(
       @CliOption(key = CliStrings.STATUS_GATEWAYRECEIVER__GROUP,
       optionContext = ConverterHint.MEMBERGROUP,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7f0310e7/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GatewayReceiverMBeanSecurityTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GatewayReceiverMBeanSecurityTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GatewayReceiverMBeanSecurityTest.java
index a191eda..049f6cb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GatewayReceiverMBeanSecurityTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GatewayReceiverMBeanSecurityTest.java
@@ -82,8 +82,8 @@ public class GatewayReceiverMBeanSecurityTest {
   @JMXConnectionConfiguration(user = "stranger", password = "1234567")
   public void testNoAccess() throws Exception {
     assertThatThrownBy(() -> bean.getTotalConnectionsTimedOut()).hasMessageStartingWith("Access
Denied: Not authorized for JMX:GET");
-    assertThatThrownBy(() -> bean.start()).hasMessageStartingWith("Access Denied: Not
authorized for GATEWAY_RECEIVER:START");
-    assertThatThrownBy(() -> bean.stop()).hasMessageStartingWith("Access Denied: Not authorized
for GATEWAY_RECEIVER:STOP");
+    assertThatThrownBy(() -> bean.start()).hasMessageStartingWith("Access Denied: Not
authorized for GATEWAY:MANAGE");
+    assertThatThrownBy(() -> bean.stop()).hasMessageStartingWith("Access Denied: Not authorized
for GATEWAY:MANAGE");
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7f0310e7/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GatewaySenderMBeanSecurityTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GatewaySenderMBeanSecurityTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GatewaySenderMBeanSecurityTest.java
index a934a09..72551a9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GatewaySenderMBeanSecurityTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GatewaySenderMBeanSecurityTest.java
@@ -95,11 +95,11 @@ public class GatewaySenderMBeanSecurityTest {
     assertThatThrownBy(() -> bean.getOrderPolicy()).hasMessageStartingWith("Access Denied:
Not authorized for JMX:GET");
     assertThatThrownBy(() -> bean.isBatchConflationEnabled()).hasMessageStartingWith("Access
Denied: Not authorized for JMX:GET");
     assertThatThrownBy(() -> bean.isManualStart()).hasMessageStartingWith("Access Denied:
Not authorized for JMX:GET");
-    assertThatThrownBy(() -> bean.pause()).hasMessageStartingWith("Access Denied: Not
authorized for GATEWAY_SENDER:PAUSE");
-    assertThatThrownBy(() -> bean.rebalance()).hasMessageStartingWith("Access Denied:
Not authorized for GATEWAY_SENDER:REBALANCE");
-    assertThatThrownBy(() -> bean.resume()).hasMessageStartingWith("Access Denied: Not
authorized for GATEWAY_SENDER:RESUME");
-    assertThatThrownBy(() -> bean.start()).hasMessageStartingWith("Access Denied: Not
authorized for GATEWAY_SENDER:START");
-    assertThatThrownBy(() -> bean.stop()).hasMessageStartingWith("Access Denied: Not authorized
for GATEWAY_SENDER:STOP");
+    assertThatThrownBy(() -> bean.pause()).hasMessageStartingWith("Access Denied: Not
authorized for GATEWAY:MANAGE");
+    assertThatThrownBy(() -> bean.rebalance()).hasMessageStartingWith("Access Denied:
Not authorized for GATEWAY:MANAGE");
+    assertThatThrownBy(() -> bean.resume()).hasMessageStartingWith("Access Denied: Not
authorized for GATEWAY:MANAGE");
+    assertThatThrownBy(() -> bean.start()).hasMessageStartingWith("Access Denied: Not
authorized for GATEWAY:MANAGE");
+    assertThatThrownBy(() -> bean.stop()).hasMessageStartingWith("Access Denied: Not authorized
for GATEWAY:MANAGE");
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7f0310e7/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/WanCommandsSecurityTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/WanCommandsSecurityTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/WanCommandsSecurityTest.java
index 771458c..8c73e8a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/WanCommandsSecurityTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/WanCommandsSecurityTest.java
@@ -53,6 +53,7 @@ public class WanCommandsSecurityTest {
     bean.processCommand("pause gateway-sender --id=sender1");
     bean.processCommand("resume gateway-sender --id=sender1");
     bean.processCommand("stop gateway-sender --id=sender1");
+    bean.processCommand("load-balance gateway-sender --id=sender1");
     bean.processCommand("list gateways");
     bean.processCommand("create gateway-receiver");
     bean.processCommand("start gateway-receiver");
@@ -66,41 +67,47 @@ public class WanCommandsSecurityTest {
   public void testNoAccess(){
     assertThatThrownBy(() -> bean.processCommand("create gateway-sender --id=sender1 --remote-distributed-system-id=2"))
         .isInstanceOf(SecurityException.class)
-        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY_SENDER:CREATE");
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:MANAGE");
 
     assertThatThrownBy(() -> bean.processCommand("start gateway-sender --id=sender1"))
         .isInstanceOf(SecurityException.class)
-        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY_SENDER:START");
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:MANAGE");
 
     assertThatThrownBy(() -> bean.processCommand("pause gateway-sender --id=sender1"))
         .isInstanceOf(SecurityException.class)
-        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY_SENDER:PAUSE");
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:MANAGE");
 
     assertThatThrownBy(() -> bean.processCommand("resume gateway-sender --id=sender1"))
         .isInstanceOf(SecurityException.class)
-        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY_SENDER:RESUME");
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:MANAGE");
 
     assertThatThrownBy(() -> bean.processCommand("stop gateway-sender --id=sender1"))
         .isInstanceOf(SecurityException.class)
-        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY_SENDER:STOP");
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:MANAGE");
 
-    bean.processCommand("list gateways");
+    assertThatThrownBy(() -> bean.processCommand("load-balance gateway-sender --id=sender1"))
+        .isInstanceOf(SecurityException.class)
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:MANAGE");
+
+    assertThatThrownBy(() -> bean.processCommand("list gateways"))
+        .isInstanceOf(SecurityException.class)
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:LIST");
 
     assertThatThrownBy(() -> bean.processCommand("create gateway-receiver"))
         .isInstanceOf(SecurityException.class)
-        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY_RECEIVER:CREATE");
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:MANAGE");
 
     assertThatThrownBy(() -> bean.processCommand("start gateway-receiver"))
         .isInstanceOf(SecurityException.class)
-        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY_RECEIVER:START");
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:MANAGE");
 
     assertThatThrownBy(() -> bean.processCommand("stop gateway-receiver"))
         .isInstanceOf(SecurityException.class)
-        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY_RECEIVER:STOP");
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:MANAGE");
 
     assertThatThrownBy(() -> bean.processCommand("status gateway-receiver"))
         .isInstanceOf(SecurityException.class)
-        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY_RECEIVER:STATUS");
+        .hasMessageStartingWith("Access Denied: Not authorized for GATEWAY:LIST");
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7f0310e7/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/security/cacheServer.json
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/security/cacheServer.json
b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/security/cacheServer.json
index e7404f9..0f8df37 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/security/cacheServer.json
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/security/cacheServer.json
@@ -3,16 +3,8 @@
     {
       "name": "admin",
       "operationsAllowed": [
-        "DISTRIBUTED_SYSTEM:LIST",
-        "GATEWAY_RECEIVER:CREATE",
-        "GATEWAY_RECEIVER:START",
-        "GATEWAY_RECEIVER:STOP",
-        "GATEWAY_RECEIVER:STATUS",
-        "GATEWAY_SENDER:CREATE",
-        "GATEWAY_SENDER:START",
-        "GATEWAY_SENDER:PAUSE",
-        "GATEWAY_SENDER:RESUME",
-        "GATEWAY_SENDER:STOP"
+        "GATEWAY:LIST",
+        "GATEWAY:MANAGE"
       ]
     },
     {
@@ -47,13 +39,7 @@
         "REGION:DELETE",
         "LOCK_SERVICE:BECOME_LOCK_GRANTOR",
         "JMX:GET",
-        "GATEWAY_SENDER:PAUSE",
-        "GATEWAY_SENDER:REBALANCE",
-        "GATEWAY_SENDER:RESUME",
-        "GATEWAY_SENDER:START",
-        "GATEWAY_SENDER:STOP",
-        "GATEWAY_RECEIVER:START",
-        "GATEWAY_RECEIVER:STOP",
+        "GATEWAY:MANAGE",
         "MANAGER:SET_PULSE_URL",
         "MANAGER:START",
         "MANAGER:STOP",


Mime
View raw message