YARN-425. coverage fix for yarn api (Aleksey Gorshkov via jeagles)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528644 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -32,6 +32,8 @@ Release 2.3.0 - UNRELEASED
     YARN-677. Increase coverage to FairScheduler (Vadim Bondarev and Dennis Y
     via jeagles)
 
+    YARN-425. coverage fix for yarn api (Aleksey Gorshkov via jeagles)
+
   OPTIMIZATIONS
 
   BUG FIXES

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestResourceManagerAdministrationProtocolPBClientImpl.java

@@ -0,0 +1,191 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.yarn.client;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.service.Service.STATE;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.factories.RecordFactory;
+import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
+import org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocol;
+import org.apache.hadoop.yarn.server.api.impl.pb.client.ResourceManagerAdministrationProtocolPBClientImpl;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsResponse;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesResponse;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesResponse;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsResponse;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationResponse;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshUserToGroupsMappingsResponse;
+import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Test ResourceManagerAdministrationProtocolPBClientImpl. Test a methods and the proxy without  logic.
+ */
+public class TestResourceManagerAdministrationProtocolPBClientImpl {
+  private static ResourceManager resourceManager;
+  private static final Log LOG = LogFactory
+          .getLog(TestResourceManagerAdministrationProtocolPBClientImpl.class);
+  private final RecordFactory recordFactory = RecordFactoryProvider
+          .getRecordFactory(null);
+
+  private static ResourceManagerAdministrationProtocol client;
+
+  /**
+   * Start resource manager server
+   */
+
+  @BeforeClass
+  public static void setUpResourceManager() throws IOException,
+          InterruptedException {
+    Configuration.addDefaultResource("config-with-security.xml");
+    Configuration configuration = new YarnConfiguration();
+    resourceManager = new ResourceManager() {
+      @Override
+      protected void doSecureLogin() throws IOException {
+      }
+    };
+    resourceManager.init(configuration);
+    new Thread() {
+      public void run() {
+        resourceManager.start();
+      }
+    }.start();
+    int waitCount = 0;
+    while (resourceManager.getServiceState() == STATE.INITED
+            && waitCount++ < 10) {
+      LOG.info("Waiting for RM to start...");
+      Thread.sleep(1000);
+    }
+    if (resourceManager.getServiceState() != STATE.STARTED) {
+      throw new IOException("ResourceManager failed to start. Final state is "
+              + resourceManager.getServiceState());
+    }
+    LOG.info("ResourceManager RMAdmin address: "
+            + configuration.get(YarnConfiguration.RM_ADMIN_ADDRESS));
+
+    client = new ResourceManagerAdministrationProtocolPBClientImpl(1L,
+            getProtocolAddress(configuration), configuration);
+
+  }
+
+  /**
+   * Test method refreshQueues. This method is present and it works.
+   */
+  @Test
+  public void testRefreshQueues() throws Exception {
+
+    RefreshQueuesRequest request = recordFactory
+            .newRecordInstance(RefreshQueuesRequest.class);
+    RefreshQueuesResponse response = client.refreshQueues(request);
+    assertNotNull(response);
+  }
+
+  /**
+   * Test method refreshNodes. This method is present and it works.
+   */
+
+  @Test
+  public void testRefreshNodes() throws Exception {
+    resourceManager.getClientRMService();
+    RefreshNodesRequest request = recordFactory
+            .newRecordInstance(RefreshNodesRequest.class);
+    RefreshNodesResponse response = client.refreshNodes(request);
+    assertNotNull(response);
+  }
+
+  /**
+   * Test method refreshSuperUserGroupsConfiguration. This method present and it works.
+   */
+  @Test
+  public void testRefreshSuperUserGroupsConfiguration() throws Exception {
+
+    RefreshSuperUserGroupsConfigurationRequest request = recordFactory
+            .newRecordInstance(RefreshSuperUserGroupsConfigurationRequest.class);
+    RefreshSuperUserGroupsConfigurationResponse response = client
+            .refreshSuperUserGroupsConfiguration(request);
+    assertNotNull(response);
+  }
+
+  /**
+   * Test method refreshUserToGroupsMappings. This method is present and it works.
+   */
+  @Test
+  public void testRefreshUserToGroupsMappings() throws Exception {
+    RefreshUserToGroupsMappingsRequest request = recordFactory
+            .newRecordInstance(RefreshUserToGroupsMappingsRequest.class);
+    RefreshUserToGroupsMappingsResponse response = client
+            .refreshUserToGroupsMappings(request);
+    assertNotNull(response);
+  }
+
+  /**
+   * Test method refreshAdminAcls. This method is present and it works.
+   */
+
+  @Test
+  public void testRefreshAdminAcls() throws Exception {
+    RefreshAdminAclsRequest request = recordFactory
+            .newRecordInstance(RefreshAdminAclsRequest.class);
+    RefreshAdminAclsResponse response = client.refreshAdminAcls(request);
+    assertNotNull(response);
+  }
+
+  @Test
+  public void testRefreshServiceAcls() throws Exception {
+    RefreshServiceAclsRequest request = recordFactory
+            .newRecordInstance(RefreshServiceAclsRequest.class);
+    RefreshServiceAclsResponse response = client.refreshServiceAcls(request);
+    assertNotNull(response);
+
+  }
+
+  /**
+   * Stop server
+   */
+
+  @AfterClass
+  public static void tearDownResourceManager() throws InterruptedException {
+    if (resourceManager != null) {
+      LOG.info("Stopping ResourceManager...");
+      resourceManager.stop();
+    }
+  }
+
+  private static InetSocketAddress getProtocolAddress(Configuration conf)
+          throws IOException {
+    return conf.getSocketAddr(YarnConfiguration.RM_ADMIN_ADDRESS,
+            YarnConfiguration.DEFAULT_RM_ADMIN_ADDRESS,
+            YarnConfiguration.DEFAULT_RM_ADMIN_PORT);
+  }
+
+}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestYarnApiClasses.java

@@ -0,0 +1,113 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.yarn.client;
+
+
+
+import org.apache.hadoop.security.proto.SecurityProtos.CancelDelegationTokenRequestProto;
+import org.apache.hadoop.security.proto.SecurityProtos.RenewDelegationTokenRequestProto;
+import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.CancelDelegationTokenRequestPBImpl;
+import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.RenewDelegationTokenRequestPBImpl;
+import org.apache.hadoop.yarn.api.records.Priority;
+import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.api.records.ResourceRequest;
+import org.apache.hadoop.yarn.api.records.Token;
+import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+
+public class TestYarnApiClasses {
+  private final org.apache.hadoop.yarn.factories.RecordFactory recordFactory = RecordFactoryProvider
+          .getRecordFactory(null);
+
+  /**
+   * Simple test Resource request.
+   * Test hashCode, equals and compare.
+   */
+  @Test
+  public void testResourceRequest() {
+
+    Resource resource = recordFactory.newRecordInstance(Resource.class);
+    Priority priority = recordFactory.newRecordInstance(Priority.class);
+
+    ResourceRequest original = ResourceRequest.newInstance(priority, "localhost", resource, 2) ;
+
+    ResourceRequest copy = ResourceRequest.newInstance(priority, "localhost", resource, 2);
+
+    assertTrue(original.equals(copy));
+    assertEquals(0, original.compareTo(copy));
+    assertTrue(original.hashCode() == copy.hashCode());
+
+    copy.setNumContainers(1);
+
+    assertFalse(original.equals(copy));
+    assertNotSame(0, original.compareTo(copy));
+    assertFalse(original.hashCode() == copy.hashCode());
+
+  }
+
+  /**
+  * Test CancelDelegationTokenRequestPBImpl.
+  * Test a transformation to prototype and back
+  */
+  @Test
+  public void testCancelDelegationTokenRequestPBImpl() {
+
+    Token token = getDelegationToken();
+
+    CancelDelegationTokenRequestPBImpl original = new CancelDelegationTokenRequestPBImpl();
+    original.setDelegationToken(token);
+    CancelDelegationTokenRequestProto protoType = original.getProto();
+
+    CancelDelegationTokenRequestPBImpl copy = new CancelDelegationTokenRequestPBImpl(protoType);
+    assertNotNull(copy.getDelegationToken());
+    //compare source and converted
+    assertEquals(token, copy.getDelegationToken());
+
+  }
+
+  /**
+  * Test RenewDelegationTokenRequestPBImpl.
+  * Test a transformation to prototype and back
+  */
+
+  @Test
+  public void testRenewDelegationTokenRequestPBImpl() {
+
+    Token token = getDelegationToken();
+
+    RenewDelegationTokenRequestPBImpl original = new RenewDelegationTokenRequestPBImpl();
+    original.setDelegationToken(token);
+    RenewDelegationTokenRequestProto protoType = original.getProto();
+
+    RenewDelegationTokenRequestPBImpl copy = new RenewDelegationTokenRequestPBImpl(protoType);
+    assertNotNull(copy.getDelegationToken());
+    //compare source and converted
+    assertEquals(token, copy.getDelegationToken());
+
+  }
+
+ 
+  private Token getDelegationToken() {
+    return Token.newInstance(new byte[0], "", new byte[0], "");
+  }
+
+
+}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/resources/config-with-security.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<!-- Do not modify this file directly.  Instead, copy entries that you -->
+<!-- wish to modify from this file into core-site.xml and change them -->
+<!-- there.  If core-site.xml does not already exist, create it.      -->
+
+<configuration>
+
+<!--- security properties -->
+
+<property>
+  <name>hadoop.security.authorization</name>
+  <value>true</value>
+  <description>Is service-level authorization enabled?</description>
+</property>
+
+
+</configuration>