Skip to content

Commit dad7a9d

Browse files
christo4ferrischristo4ferris
committed
reassign port numbers to 7050-7-60 range
reassign port numbers to 7050-7060 range to avoid conflicts with Windows port usage (5000). Fixes #2283 #2283 Port assignments as follows: 7050 REST 7051 peer gRPC 7052 peer CLI 7053 peer events 7054 eCAP 7055 eCAA 7056 tCAP 7057 tCAA 7058 tlsCAP 7059 tlsCAA NOTE: when this PR lands, it will require people to rebuild their Vagrant development environment(s), so we will want to make an announcement. Also @bcbrock recommended that we eventually seek a block of ports from IANA. We should hold off on that until we sort out Consensus next. Change-Id: I1e54d45589e155a69a2a779b1dac447d5473cf03 Signed-off-by: Christopher Ferris <[email protected]>
1 parent 1c982e8 commit dad7a9d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+299
-306
lines changed

‎bddtests/docker-compose-1-devmode.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ccenv:
1010
image: hyperledger/fabric-ccenv
1111
environment:
1212
- CORE_CHAINCODE_ID_NAME=testCC
13-
- CORE_PEER_ADDRESS=vp0:30303
13+
- CORE_PEER_ADDRESS=vp0:7051
1414
command: bash -c "GOBIN=/opt/gopath/bin go install github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02 && /opt/gopath/bin/chaincode_example02"
1515
links:
16-
- vp0
16+
- vp0

‎bddtests/docker-compose-1-exp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ vp0:
55
environment:
66
- CORE_PEER_ID=vp0
77
ports:
8-
- 31315:31315
8+
- 7053:7053

‎bddtests/docker-compose-1-profiling.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ vp0:
55
environment:
66
- CORE_PEER_ID=vp0
77
- CORE_PEER_PROFILE_ENABLED=true
8-
ports:
9-
- 5000:6060
10-
8+
ports:
9+
- 7050:6060

‎bddtests/docker-compose-2-tls-basic.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ vp1:
1414
service: vp0
1515
environment:
1616
- CORE_PEER_ID=vp1
17-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
17+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
1818
links:
1919
- vp0

‎bddtests/docker-compose-2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ vp1:
1212
service: vp0
1313
environment:
1414
- CORE_PEER_ID=vp1
15-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
15+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
1616
links:
1717
- vp0

‎bddtests/docker-compose-3.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ vp1:
1010
service: vp0
1111
environment:
1212
- CORE_PEER_ID=vp1
13-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
13+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
1414
links:
1515
- vp0
1616

@@ -19,6 +19,6 @@ vp2:
1919
service: vp0
2020
environment:
2121
- CORE_PEER_ID=vp2
22-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
22+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
2323
links:
2424
- vp0

‎bddtests/docker-compose-4-consensus-base.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ vpBase:
44
service: vp
55
environment:
66
- CORE_SECURITY_ENABLED=true
7-
- CORE_PEER_PKI_ECA_PADDR=membersrvc0:50051
8-
- CORE_PEER_PKI_TCA_PADDR=membersrvc0:50051
9-
- CORE_PEER_PKI_TLSCA_PADDR=membersrvc0:50051
7+
- CORE_PEER_PKI_ECA_PADDR=membersrvc0:7054
8+
- CORE_PEER_PKI_TCA_PADDR=membersrvc0:7054
9+
- CORE_PEER_PKI_TLSCA_PADDR=membersrvc0:7054
1010
- CORE_PEER_PKI_TLS_ROOTCERT_FILE=./bddtests/tlsca.cert
1111
# TODO: Currently required due to issue reading obbca configuration location
1212
- CORE_PBFT_GENERAL_N=4

‎bddtests/docker-compose-4-consensus-batch-1-byzantine.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ vp1:
2020
service: vpBatch
2121
environment:
2222
- CORE_PEER_ID=vp1
23-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
23+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
2424
- CORE_SECURITY_ENROLLID=test_vp1
2525
- CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy
2626
links:
@@ -33,7 +33,7 @@ vp2:
3333
service: vpBatch
3434
environment:
3535
- CORE_PEER_ID=vp2
36-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
36+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
3737
- CORE_SECURITY_ENROLLID=test_vp2
3838
- CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ
3939
links:
@@ -46,10 +46,10 @@ vp3:
4646
service: vpBatch
4747
environment:
4848
- CORE_PEER_ID=vp3
49-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
49+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
5050
- CORE_SECURITY_ENROLLID=test_vp3
5151
- CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL
52-
- CORE_PBFT_GENERAL_BYZANTINE=true
52+
- CORE_PBFT_GENERAL_BYZANTINE=true
5353
links:
5454
- membersrvc0
5555
- vp0

‎bddtests/docker-compose-4-consensus-batch.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ vp0:
1414
- CORE_PEER_PROFILE_ENABLED=true
1515
links:
1616
- membersrvc0
17-
ports:
18-
- 5000:6060
17+
ports:
18+
- 7050:6060
1919

2020

2121
vp1:
@@ -24,7 +24,7 @@ vp1:
2424
service: vpBatch
2525
environment:
2626
- CORE_PEER_ID=vp1
27-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
27+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
2828
- CORE_SECURITY_ENROLLID=test_vp1
2929
- CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy
3030
links:
@@ -37,7 +37,7 @@ vp2:
3737
service: vpBatch
3838
environment:
3939
- CORE_PEER_ID=vp2
40-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
40+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
4141
- CORE_SECURITY_ENROLLID=test_vp2
4242
- CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ
4343
links:
@@ -50,7 +50,7 @@ vp3:
5050
service: vpBatch
5151
environment:
5252
- CORE_PEER_ID=vp3
53-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
53+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
5454
- CORE_SECURITY_ENROLLID=test_vp3
5555
- CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL
5656
links:

‎bddtests/docker-compose-4-consensus-noops.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ vp0:
1414
links:
1515
- membersrvc0
1616
ports:
17-
- 5000:5000
17+
- 7050:7050
1818

1919
vp1:
2020
extends:
2121
file: docker-compose-4-consensus-base.yml
2222
service: vpBase
2323
environment:
2424
- CORE_PEER_ID=vp1
25-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
25+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
2626
- CORE_SECURITY_ENROLLID=test_vp1
2727
- CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy
2828
links:
@@ -35,7 +35,7 @@ vp2:
3535
service: vpBase
3636
environment:
3737
- CORE_PEER_ID=vp2
38-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
38+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
3939
- CORE_SECURITY_ENROLLID=test_vp2
4040
- CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ
4141
links:
@@ -48,7 +48,7 @@ vp3:
4848
service: vpBase
4949
environment:
5050
- CORE_PEER_ID=vp3
51-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
51+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
5252
- CORE_SECURITY_ENROLLID=test_vp3
5353
- CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL
5454
links:

‎bddtests/docker-compose-4-consensus-nvp0.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ nvp0:
44
service: vpBase
55
environment:
66
- CORE_PEER_VALIDATOR_ENABLED=false
7-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
7+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
88
- CORE_PEER_ID=nvp0
99
- CORE_SECURITY_ENROLLID=test_nvp0
1010
- CORE_SECURITY_ENROLLSECRET=iywrPBDEPl0K
1111
links:
1212
- membersrvc0
1313
- vp0
14-

‎bddtests/docker-compose-4.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ vp1:
1010
service: vp0
1111
environment:
1212
- CORE_PEER_ID=vp1
13-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
13+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
1414
links:
1515
- vp0
1616

@@ -19,7 +19,7 @@ vp2:
1919
service: vp0
2020
environment:
2121
- CORE_PEER_ID=vp2
22-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
22+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
2323
links:
2424
- vp0
2525

@@ -28,6 +28,6 @@ vp3:
2828
service: vp0
2929
environment:
3030
- CORE_PEER_ID=vp3
31-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
31+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
3232
links:
3333
- vp0

‎bddtests/docker-compose-5.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ vp1:
1010
service: vp0
1111
environment:
1212
- CORE_PEER_ID=vp1
13-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
13+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
1414
links:
1515
- vp0
1616

@@ -19,7 +19,7 @@ vp2:
1919
service: vp0
2020
environment:
2121
- CORE_PEER_ID=vp2
22-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
22+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
2323
links:
2424
- vp0
2525

@@ -28,7 +28,7 @@ vp3:
2828
service: vp0
2929
environment:
3030
- CORE_PEER_ID=vp3
31-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
31+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
3232
links:
3333
- vp0
3434

@@ -37,6 +37,6 @@ vp4:
3737
service: vp0
3838
environment:
3939
- CORE_PEER_ID=vp4
40-
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303
40+
- CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051
4141
links:
4242
- vp0

‎bddtests/docker-compose-sdk-node.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
sampleApp0:
22
image: hyperledger-sdk-node
33
environment:
4-
- MEMBERSRVC_ADDRESS=membersrvc0:50051
5-
- PEER_ADDRESS=vp0:30303
4+
- MEMBERSRVC_ADDRESS=membersrvc0:7054
5+
- PEER_ADDRESS=vp0:7051
66
- KEY_VALUE_STORE=/tmp/hl_sdk_node_key_value_store
77
# Startup of peer must be delayed to allow membersrvc to come up first
88
command: node sampleSDKApp
99
links:
1010
- membersrvc0
1111
- vp0
12-

‎bddtests/steps/bdd_grpc_util.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def getTxResult(context, enrollId):
3535

3636
(channel, userRegistration) = getGRPCChannelAndUser(context, enrollId)
3737
stub = devops_pb2.beta_create_Devops_stub(channel)
38-
38+
3939
txRequest = devops_pb2.TransactionRequest(transactionUuid = context.transactionID)
4040
response = stub.GetTransactionResult(txRequest, 2)
4141
assert response.status == fabric_pb2.Response.SUCCESS, 'Failure getting Transaction Result from {0}, for user "{1}": {2}'.format(userRegistration.composeService,enrollId, response.msg)
@@ -45,7 +45,7 @@ def getTxResult(context, enrollId):
4545
return txResult
4646

4747
def getGRPCChannel(ipAddress):
48-
channel = implementations.insecure_channel(ipAddress, 30303)
48+
channel = implementations.insecure_channel(ipAddress, 7051)
4949
print("Returning GRPC for address: {0}".format(ipAddress))
5050
return channel
5151

@@ -58,7 +58,7 @@ def getGRPCChannelAndUser(context, enrollId):
5858

5959
channel = getGRPCChannel(ipAddress)
6060

61-
return (channel, userRegistration)
61+
return (channel, userRegistration)
6262

6363

6464
def getDeployment(context, ccAlias):
@@ -69,9 +69,9 @@ def getDeployment(context, ccAlias):
6969
else:
7070
context.deployments = {}
7171
if ccAlias in context.deployments:
72-
deployment = context.deployments[ccAlias]
72+
deployment = context.deployments[ccAlias]
7373
# else:
74-
# raise Exception("Deployment alias not found: '{0}'. Are you sure you have deployed a chaincode with this alias?".format(ccAlias))
74+
# raise Exception("Deployment alias not found: '{0}'. Are you sure you have deployed a chaincode with this alias?".format(ccAlias))
7575
return deployment
7676

7777
def deployChaincode(context, enrollId, chaincodePath, ccAlias, ctor):
@@ -106,17 +106,17 @@ def invokeChaincode(context, enrollId, ccAlias, functionName):
106106
# Create a new ChaincodeSpec by copying the deployed one
107107
newChaincodeSpec = chaincode_pb2.ChaincodeSpec()
108108
newChaincodeSpec.CopyFrom(deployedCcSpec)
109-
109+
110110
# Update hte chaincodeSpec ctorMsg for invoke
111111
args = getArgsFromContextForUser(context, enrollId)
112-
113-
chaincodeInput = chaincode_pb2.ChaincodeInput(function = functionName, args = args )
112+
113+
chaincodeInput = chaincode_pb2.ChaincodeInput(function = functionName, args = args )
114114
newChaincodeSpec.ctorMsg.CopyFrom(chaincodeInput)
115115

116116
ccInvocationSpec = chaincode_pb2.ChaincodeInvocationSpec(chaincodeSpec = newChaincodeSpec)
117117

118118
(channel, userRegistration) = getGRPCChannelAndUser(context, enrollId)
119-
119+
120120
stub = devops_pb2.beta_create_Devops_stub(channel)
121121
response = stub.Invoke(ccInvocationSpec,2)
122122
return response

‎bddtests/steps/peer_basic_impl.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import bdd_test_util
2727

28-
CORE_REST_PORT = 5000
28+
CORE_REST_PORT = 7050
2929
JSONRPC_VERSION = "2.0"
3030

3131
class ContainerData:

‎core/chaincode/chaincode_support.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const (
4747
DevModeUserRunsChaincode string = "dev"
4848
chaincodeStartupTimeoutDefault int = 5000
4949
chaincodeInstallPathDefault string = "/opt/gopath/bin/"
50-
peerAddressDefault string = "0.0.0.0:30303"
50+
peerAddressDefault string = "0.0.0.0:7051"
5151
)
5252

5353
// chains is a map between different blockchains and their ChaincodeSupport.

‎core/chaincode/chaincodetest.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ eca:
8181
cli:
8282

8383
# The address that the cli process will use for callbacks from chaincodes
84-
address: 0.0.0.0:30304
84+
address: 0.0.0.0:7052
8585

8686

8787

@@ -98,7 +98,7 @@ rest:
9898
enabled: true
9999

100100
# The address that the REST service will listen on for incoming requests.
101-
address: 0.0.0.0:5000
101+
address: 0.0.0.0:7050
102102

103103

104104
###############################################################################
@@ -226,7 +226,7 @@ peer:
226226

227227
events:
228228
# The address that the Event service will be enabled on the validator
229-
address: 0.0.0.0:31315
229+
address: 0.0.0.0:7053
230230

231231
# total number of events that could be buffered without blocking the
232232
# validator sends

0 commit comments

Comments
 (0)