Commit 198b8e99 authored by David Enyeart's avatar David Enyeart Committed by Gerrit Code Review
Browse files

Merge "FAB-10121 Remove org scoped profile from struct"

parents ec1f138b e481ca82
......@@ -63,21 +63,18 @@ var _ = Describe("EndToEnd", func() {
ordererOrgs := world.OrdererConfig{
OrganizationName: "OrdererOrg",
Domain: "example.com",
ProfileName: "TwoOrgsOrdererGenesis",
OrdererNames: []string{"orderer"},
BrokerCount: 0,
}
peerOrgs := []world.PeerOrgConfig{{
OrganizationName: pOrg[0].Name,
ProfileName: "TwoOrgsChannel",
Domain: "org1.example.com",
EnableNodeOUs: false,
UserCount: 1,
PeerCount: 1,
}, {
OrganizationName: pOrg[1].Name,
ProfileName: "TwoOrgsChannel",
Domain: "org2.example.com",
EnableNodeOUs: false,
UserCount: 1,
......@@ -154,8 +151,8 @@ var _ = Describe("EndToEnd", func() {
}
profiles := map[string]localconfig.Profile{
peerOrgs[0].ProfileName: peerProfile,
ordererOrgs.ProfileName: ordererProfile,
"TwoOrgsOrdererGenesis": ordererProfile,
"TwoOrgsChannel": peerProfile,
}
crypto := runner.Cryptogen{
......@@ -170,8 +167,8 @@ var _ = Describe("EndToEnd", func() {
Deployment: deployment,
OrdererOrgs: []world.OrdererConfig{ordererOrgs},
PeerOrgs: peerOrgs,
OrdererProfileName: ordererOrgs.ProfileName,
ChannelProfileName: peerOrgs[0].ProfileName,
OrdererProfileName: "TwoOrgsOrdererGenesis",
ChannelProfileName: "TwoOrgsChannel",
Profiles: profiles,
}
})
......
......@@ -30,7 +30,6 @@ type Profile struct {
type OrdererConfig struct {
OrganizationName string
ProfileName string
Domain string
OrdererNames []string
BrokerCount int // 0 is solo
......@@ -41,7 +40,6 @@ type OrdererConfig struct {
type PeerOrgConfig struct {
OrganizationName string
ProfileName string
Domain string
EnableNodeOUs bool
UserCount int
......
......@@ -119,7 +119,6 @@ var _ = Describe("Config", func() {
ordererOrgs := []OrdererConfig{{
OrganizationName: "OrdererOrg0",
Domain: "OrdererMSP",
ProfileName: "TwoOrgsOrdererGenesis",
OrdererNames: []string{"orderer0"},
BrokerCount: 0,
ZookeeperCount: 1,
......@@ -128,7 +127,6 @@ var _ = Describe("Config", func() {
}, {
OrganizationName: "OrdererOrg1",
Domain: "OrdererMSP",
ProfileName: "Different",
OrdererNames: []string{"orderer1"},
BrokerCount: 0,
ZookeeperCount: 2,
......@@ -137,7 +135,6 @@ var _ = Describe("Config", func() {
}}
peerOrgs := []PeerOrgConfig{{
ProfileName: "TwoOrgsChannel",
OrganizationName: pOrg[0].Name,
Domain: pOrg[0].ID,
EnableNodeOUs: true,
......@@ -223,8 +220,8 @@ var _ = Describe("Config", func() {
}
profiles := map[string]localconfig.Profile{
peerOrgs[0].ProfileName: peerProfile,
ordererOrgs[0].ProfileName: ordererProfile,
"TwoOrgsChannel": peerProfile,
"TwoOrgsOrdererGenesis": ordererProfile,
}
w = World{
......@@ -235,8 +232,8 @@ var _ = Describe("Config", func() {
Deployment: deployment,
OrdererOrgs: ordererOrgs,
PeerOrgs: peerOrgs,
OrdererProfileName: ordererOrgs[0].ProfileName,
ChannelProfileName: peerOrgs[0].ProfileName,
OrdererProfileName: "TwoOrgsOrdererGenesis",
ChannelProfileName: "TwoOrgsChannel",
Profiles: profiles,
}
......@@ -283,7 +280,6 @@ var _ = Describe("Config", func() {
ordererOrgs := OrdererConfig{
OrganizationName: "ExampleCom",
Domain: "example.com",
ProfileName: "TwoOrgsOrdererGenesis",
OrdererNames: []string{"orderer0"},
BrokerCount: 0,
ZookeeperCount: 1,
......@@ -292,14 +288,12 @@ var _ = Describe("Config", func() {
}
peerOrgs := []PeerOrgConfig{{
ProfileName: "TwoOrgsChannel",
OrganizationName: pOrg[0].Name,
Domain: "org1.example.com",
EnableNodeOUs: true,
UserCount: 2,
PeerCount: 2,
}, {
ProfileName: "TwoOrgsChannel",
OrganizationName: pOrg[1].Name,
Domain: "org2.example.com",
EnableNodeOUs: true,
......@@ -377,8 +371,8 @@ var _ = Describe("Config", func() {
}
profiles := map[string]localconfig.Profile{
peerOrgs[0].ProfileName: peerProfile,
ordererOrgs.ProfileName: ordererProfile,
"TwoOrgsChannel": peerProfile,
"TwoOrgsOrdererGenesis": ordererProfile,
}
crypto := runner.Cryptogen{
......@@ -402,8 +396,8 @@ var _ = Describe("Config", func() {
Deployment: deployment,
OrdererOrgs: []OrdererConfig{ordererOrgs},
PeerOrgs: peerOrgs,
OrdererProfileName: ordererOrgs.ProfileName,
ChannelProfileName: peerOrgs[0].ProfileName,
OrdererProfileName: "TwoOrgsOrdererGenesis",
ChannelProfileName: "TwoOrgsChannel",
Profiles: profiles,
}
})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment