Generate local Fabric with correct port configuration - integration t…

…est changes (contributes to IBM-Blockchain#776) Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
sstone1 · Apr 23, 2019 · 4de3923 · 4de3923
1 parent 1506256
commit 4de3923
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/client/integrationTest/hlfv1/docker-compose.yml b/client/integrationTest/hlfv1/docker-compose.yml
@@ -46,6 +46,7 @@ services:
       - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/peer/msp
       - CORE_LEDGER_STATE_STATEDATABASE=CouchDB
       - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb:5984
+      - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric
     command: peer node start
     ports:

diff --git a/client/integrationTest/integrationTestUtil.ts b/client/integrationTest/integrationTestUtil.ts
@@ -431,7 +431,7 @@ export class IntegrationTestUtil {
             await vscode.commands.executeCommand(ExtensionCommands.DELETE_IDENTITY);
         }
 
-        this.showCertificateAuthorityQuickPickStub.withArgs('Choose certificate authority to create a new identity with').resolves('ca.example.com');
+        this.showCertificateAuthorityQuickPickStub.withArgs('Choose certificate authority to create a new identity with').resolves('ca.org1.example.com');
         this.inputBoxStub.withArgs('Provide a name for the identity').resolves(name);
         await vscode.commands.executeCommand(ExtensionCommands.CREATE_NEW_IDENTITY);
     }

diff --git a/client/integrationTest/nodeTests/integrationNode.test.ts b/client/integrationTest/nodeTests/integrationNode.test.ts
@@ -172,7 +172,7 @@ describe('Integration Tests for Node Smart Contracts', () => {
                 const nodesChildren: Array<SmartContractsTreeItem> = await myExtension.getBlockchainRuntimeExplorerProvider().getChildren(allChildren[2]) as Array<SmartContractsTreeItem>;
                 nodesChildren.length.should.equal(3);
                 nodesChildren[0].label.should.equal('peer0.org1.example.com');
-                nodesChildren[1].label.should.equal('ca.example.com');
+                nodesChildren[1].label.should.equal('ca.org1.example.com');
                 nodesChildren[2].label.should.equal('orderer.example.com');
 
                 let instantiatedChaincodesItems: Array<InstantiatedContractTreeItem> = await myExtension.getBlockchainRuntimeExplorerProvider().getChildren(smartContractsChildren[0]) as Array<InstantiatedContractTreeItem>;
@@ -297,7 +297,7 @@ describe('Integration Tests for Node Smart Contracts', () => {
                 const nodesChildren: Array<SmartContractsTreeItem> = await myExtension.getBlockchainRuntimeExplorerProvider().getChildren(allChildren[2]) as Array<SmartContractsTreeItem>;
                 nodesChildren.length.should.equal(3);
                 nodesChildren[0].label.should.equal('peer0.org1.example.com');
-                nodesChildren[1].label.should.equal('ca.example.com');
+                nodesChildren[1].label.should.equal('ca.org1.example.com');
                 nodesChildren[2].label.should.equal('orderer.example.com');
 
                 const instantiatedChaincodesItems: Array<InstantiatedContractTreeItem> = await myExtension.getBlockchainRuntimeExplorerProvider().getChildren(smartContractsChildren[0]) as Array<InstantiatedContractTreeItem>;
@@ -317,7 +317,7 @@ describe('Integration Tests for Node Smart Contracts', () => {
                 installedSmartContract.should.not.be.null;
 
                 integrationTestUtil.showIdentitiesQuickPickStub.withArgs('Choose an identity to connect with').resolves(FabricRuntimeUtil.ADMIN_USER);
-                await integrationTestUtil.connectToFabric(FabricRuntimeUtil.LOCAL_FABRIC, FabricWalletUtil.LOCAL_WALLET, 'Admin@org1.example.com');
+                await integrationTestUtil.connectToFabric(FabricRuntimeUtil.LOCAL_FABRIC, FabricWalletUtil.LOCAL_WALLET, 'admin');
 
                 allChildren = await myExtension.getBlockchainGatewayExplorerProvider().getChildren();
 

diff --git a/client/integrationTest/tests/integration.test.ts b/client/integrationTest/tests/integration.test.ts
@@ -169,7 +169,7 @@ describe('Integration Tests for Fabric and Go/Java Smart Contracts', () => {
 
             nodesChildren.length.should.equal(3);
             nodesChildren[0].label.should.equal('peer0.org1.example.com');
-            nodesChildren[1].label.should.equal('ca.example.com');
+            nodesChildren[1].label.should.equal('ca.org1.example.com');
             nodesChildren[2].label.should.equal('orderer.example.com');
 
             const orgsChildren: Array<OrgTreeItem> = await myExtension.getBlockchainRuntimeExplorerProvider().getChildren(allChildren[3]) as Array<OrgTreeItem>;
@@ -400,7 +400,7 @@ describe('Integration Tests for Fabric and Go/Java Smart Contracts', () => {
 
             const identitities: Array<BlockchainTreeItem> = await myExtension.getBlockchainWalletExplorerProvider().getChildren(wallets[0]);
             identitities.length.should.equal(3);
-            identitities[0].label.should.equal('Admin@org1.example.com ⭑');
+            identitities[0].label.should.equal('admin ⭑');
             identitities[1].label.should.equal(anotherIdentityName);
             identitities[2].label.should.equal(otherUserName);
 
@@ -431,7 +431,7 @@ describe('Integration Tests for Fabric and Go/Java Smart Contracts', () => {
                 const nodesChildren: Array<PeerTreeItem> = await myExtension.getBlockchainRuntimeExplorerProvider().getChildren(allChildren[2]) as Array<PeerTreeItem>;
                 nodesChildren.length.should.equal(3);
                 nodesChildren[0].label.should.equal('peer0.org1.example.com');
-                nodesChildren[1].label.should.equal('ca.example.com');
+                nodesChildren[1].label.should.equal('ca.org1.example.com');
                 nodesChildren[2].label.should.equal('orderer.example.com');
 
                 let instantiatedChaincodesItems: Array<InstantiatedChaincodeTreeItem> = await myExtension.getBlockchainRuntimeExplorerProvider().getChildren(smartContractsChildren[0]) as Array<InstantiatedChaincodeTreeItem>;
@@ -443,7 +443,7 @@ describe('Integration Tests for Fabric and Go/Java Smart Contracts', () => {
                 instantiatedSmartContract.should.not.be.null;
 
                 integrationTestUtil.showIdentitiesQuickPickStub.resolves(FabricRuntimeUtil.ADMIN_USER);
-                await integrationTestUtil.connectToFabric(FabricRuntimeUtil.LOCAL_FABRIC, FabricWalletUtil.LOCAL_WALLET, 'Admin@org1.example.com');
+                await integrationTestUtil.connectToFabric(FabricRuntimeUtil.LOCAL_FABRIC, FabricWalletUtil.LOCAL_WALLET, 'admin');
                 await integrationTestUtil.submitTransactionToChaincode(smartContractName, '0.0.1', 'transaction1', 'hello,world');
                 await vscode.commands.executeCommand(ExtensionCommands.DISCONNECT);