[FABG-728] Fix Org2 local test configuration

Change-Id: I562fced58d189cf65b155a4ec21154d9ed6ae0f8 Signed-off-by: Troy Ronda <troy@troyronda.com>
hyperledger · Aug 24, 2018 · 4d38dbd · 4d38dbd
1 parent 145b24c
commit 4d38dbd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/test/fixtures/config/config_e2e_multiorg_bootstrap.yaml b/test/fixtures/config/config_e2e_multiorg_bootstrap.yaml
@@ -144,6 +144,7 @@ peers:
 
   peer0.org2.example.com:
     url: peer0.org2.example.com:8051
+
     grpcOptions:
       ssl-target-name-override: peer0.org2.example.com
       keep-alive-time: 0s
@@ -193,4 +194,9 @@ entityMatchers:
     - pattern: (\w+).org1.example.com:(\d+)
       urlSubstitutionExp: $1.org1.example.com:$2
       sslTargetOverrideUrlSubstitutionExp: $1.org1.example.com
-      mappedHost: peer0.org1.example.com
+      mappedHost: peer0.org1.example.com
+
+    - pattern: (\w+).org2.example.com:(\d+)
+      urlSubstitutionExp: $1.org2.example.com:$2
+      sslTargetOverrideUrlSubstitutionExp: $1.org2.example.com
+      mappedHost: peer0.org2.example.com
diff --git a/test/fixtures/config/overrides/local_entity_matchers.yaml b/test/fixtures/config/overrides/local_entity_matchers.yaml
@@ -20,17 +20,6 @@
 # In any case mappedHost's config will be used, so mapped host cannot be empty, if entityMatchers are used
 entityMatchers:
   peer:
-
-    ## TODO added below peer to ignore list, to avoid these revoked peer to conflict with bootstrap test
-    - pattern: peer1.org2.example.com:(\d+)
-      ignoreEndpoint: true
-
-    - pattern: peer1.org2.example.com
-      ignoreEndpoint: true
-
-    - pattern: (\w+):9051
-      ignoreEndpoint: true
-
     - pattern: peer0.org1.example.(\w+)
       urlSubstitutionExp: localhost:7051
       sslTargetOverrideUrlSubstitutionExp: peer0.org1.example.com
@@ -46,11 +35,21 @@ entityMatchers:
       sslTargetOverrideUrlSubstitutionExp: peer0.org2.example.com
       mappedHost: peer0.org2.example.com
 
+    - pattern: peer1.org2.example.(\w+)
+      urlSubstitutionExp: localhost:9051
+      sslTargetOverrideUrlSubstitutionExp: peer1.org2.example.com
+      mappedHost: peer1.org2.example.com
+
     - pattern: (\w+).org1.example.(\w+):(\d+)
       urlSubstitutionExp: localhost:$2
       sslTargetOverrideUrlSubstitutionExp: $1.org1.example.com
       mappedHost: $1.org1.example.com
 
+    - pattern: (\w+).org2.example.(\w+):(\d+)
+      urlSubstitutionExp: localhost:$2
+      sslTargetOverrideUrlSubstitutionExp: $1.org2.example.com
+      mappedHost: $1.org2.example.com
+
     - pattern: (\w+):7051
       urlSubstitutionExp: localhost:7051
       sslTargetOverrideUrlSubstitutionExp: peer0.org1.example.com
@@ -66,6 +65,10 @@ entityMatchers:
       sslTargetOverrideUrlSubstitutionExp: peer0.org2.example.com
       mappedHost: peer0.org2.example.com
 
+    - pattern: (\w+):9051
+      urlSubstitutionExp: localhost:9051
+      sslTargetOverrideUrlSubstitutionExp: peer1.org2.example.com
+      mappedHost: peer1.org2.example.com
 
   orderer: