FABJ-411 Enable service disc IT build verify

Change-Id: I64fafb807f47ffe8c07d6ad575bbb1101a341dbf
Signed-off-by: rickr <cr22rc@gmail.com>

Author: cr22rc

src/test/cirun.sh

@@ -31,6 +31,11 @@ export ORG_HYPERLEDGER_FABRIC_SDKTEST_DEPLOYWAITTIME=1300000
 export ORG_HYPERLEDGER_FABRIC_SDKTEST_PROPOSALWAITTIME=300000
 
 export ORG_HYPERLEDGER_FABRIC_SDKTEST_RUNIDEMIXMTTEST=true
+export ORG_HYPERLEDGER_FABRIC_SDKTEST_RUNSERVICEDISCOVERYIT=true
+echo '----- etc/hosts -------'
+cat /etc/hosts
+echo '----- etc/hosts -------'
+
 
 ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION=${ORG_HYPERLEDGER_FABRIC_SDKTEST_VERSION:-}
 ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION=${ORG_HYPERLEDGER_FABRIC_SDKTEST_FIXVERSION:-}

src/test/java/org/hyperledger/fabric/sdk/testutils/TestConfig.java

@@ -63,8 +63,10 @@ public class TestConfig {
     private static final String DEPLOYWAITTIME = PROPBASE + "DeployWaitTime";
     private static final String PROPOSALWAITTIME = PROPBASE + "ProposalWaitTime";
     private static final String RUNIDEMIXMTTEST = PROPBASE + "RunIdemixMTTest";  // org.hyperledger.fabric.sdktest.RunIdemixMTTest ORG_HYPERLEDGER_FABRIC_SDKTEST_RUNIDEMIXMTTEST
+    private static final String RUNSERVICEDISCOVERYIT = PROPBASE + "runServiceDiscoveryIT";  // org.hyperledger.fabric.sdktest.RunIdemixMTTest ORG_HYPERLEDGER_FABRIC_SDKTEST_RUNIDEMIXMTTEST
 
     private static final String INTEGRATIONTESTS_ORG = PROPBASE + "integrationTests.org.";
+
     private static final Pattern orgPat = Pattern.compile("^" + Pattern.quote(INTEGRATIONTESTS_ORG) + "([^\\.]+)\\.mspid$");
 
     private static final String INTEGRATIONTESTSTLS = PROPBASE + "integrationtests.tls";
@@ -129,6 +131,7 @@ private TestConfig() {
             defaultProperty(DEPLOYWAITTIME, "120000");
             defaultProperty(PROPOSALWAITTIME, "120000");
             defaultProperty(RUNIDEMIXMTTEST, "false");
+            defaultProperty(RUNSERVICEDISCOVERYIT, "false");
 
             //////
             defaultProperty(INTEGRATIONTESTS_ORG + "peerOrg1.mspid", "Org1MSP");
@@ -233,6 +236,17 @@ public boolean isFabricVersionBefore(String version) {
         return !isFabricVersionAtOrAfter(version);
     }
 
+    /**
+     * Service discovery needs enteries in et/hosts to resolve names to run successfully.
+     * By default turn off.
+     *
+     * @return true to run service discovery integration test.
+     */
+
+    public boolean runServiceDiscoveryIT() {
+        return Objects.equals("true", sdkProperties.get(RUNSERVICEDISCOVERYIT));
+    }
+
     private static int[] parseVersion(String version) {
         if (null == version || version.isEmpty()) {
             throw new AssertionError("Version is bad :" + version);
@@ -461,7 +475,6 @@ public File getTestNetworkConfigFileYAML() {
                 sourceText = sourceText.replaceAll("grpcs://localhost", "grpcs://" + LOCALHOST);
                 sourceText = sourceText.replaceAll("grpc://localhost", "grpc://" + LOCALHOST);
 
-
                 Files.write(Paths.get(temp.getAbsolutePath()), sourceText.getBytes(StandardCharsets.UTF_8),
                         StandardOpenOption.CREATE_NEW, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE);
 

src/test/java/org/hyperledger/fabric/sdkintegration/ServiceDiscoveryIT.java

@@ -39,7 +39,6 @@
 import org.hyperledger.fabric.sdk.exception.TransactionEventException;
 import org.hyperledger.fabric.sdk.security.CryptoSuite;
 import org.hyperledger.fabric.sdk.testutils.TestConfig;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static java.lang.String.format;
@@ -58,11 +57,14 @@ public class ServiceDiscoveryIT {
     String CHAIN_CODE_NAME = "example_cc_go";
     TransactionRequest.Type CHAIN_CODE_LANG = TransactionRequest.Type.GO_LANG;
 
-    @Ignore  //Hostnames reported by service discovery won't work unless you edit hostfile
     @Test
     public void setup() throws Exception {
         //Persistence is not part of SDK. Sample file store is for demonstration purposes only!
         //   MUST be replaced with more robust application implementation  (Database, LDAP)
+        if (!testConfig.runServiceDiscoveryIT()) {
+            out("\n\n\nNOT RUNNING: \"ServiceDiscoveryIT\"  runServiceDiscoveryIT=%b.\n", testConfig.runServiceDiscoveryIT());
+            return;
+        }
         out("\n\n\nRUNNING: %s.\n", "ServiceDiscoveryIT");
 
         SampleStore sampleStore = new SampleStore(sampleStoreFile);