Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make specifying zookeeper in topo files optional #3278

Merged
merged 3 commits into from
Oct 25, 2019
Merged

Make specifying zookeeper in topo files optional #3278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a9c490
Make specifying zookeeper in topo files optional
lukedirtwalker Oct 25, 2019
1b091f6
r1
lukedirtwalker Oct 25, 2019
7db0b37
r2
lukedirtwalker Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions acceptance/sig_failover_acceptance/Test.topo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
--- # Topology for sig_failover_acceptance test.
defaults:
zookeepers:
1:
addr: 127.0.0.1
ASes:
"1-ff00:0:110":
core: true
Expand Down
4 changes: 0 additions & 4 deletions acceptance/topo_br_reload_util/Tinier.topo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
--- # Two AS Topology
defaults:
zookeepers:
1:
addr: 127.0.0.1
ASes:
"1-ff00:0:110":
core: true
Expand Down
3 changes: 0 additions & 3 deletions python/topology/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ def _read_defaults(self, network):
priv_net = DEFAULT_PRIV_NETWORK
self.subnet_gen = SubnetGenerator(def_network, self.args.docker, self.args.in_docker)
self.prvnet_gen = SubnetGenerator(priv_net, self.args.docker, self.args.in_docker)
if "zookeepers" not in defaults:
logging.critical("No zookeeper configured in the topology!")
sys.exit(1)
self.default_mtu = defaults.get("mtu", DEFAULT_MTU)

def generate_all(self):
Expand Down
5 changes: 5 additions & 0 deletions python/topology/topo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,10 +329,15 @@ def _gen_sig_entries(self, topo_id):
self.topo_dicts[topo_id]['SIG'][elem_id] = d

def _gen_zk_entries(self, topo_id, as_conf):
if ("defaults" not in self.args.topo_config_dict or
"zookeepers" not in self.args.topo_config_dict["defaults"]):
return
zk_conf = self.args.topo_config_dict["defaults"]["zookeepers"]
if len(zk_conf) > 1:
logging.critical("Only one zk instance is supported!")
sys.exit(1)
if len(zk_conf) < 1:
return
addr = zk_conf[1].get("addr", None)
port = zk_conf[1].get("port", None)
zk_entry = self._gen_zk_entry(addr, port, self.args.in_docker, self.args.docker)
Expand Down
5 changes: 0 additions & 5 deletions topology/Default.topo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
--- # Default topology
defaults:
zookeepers:
1:
addr: 127.0.0.1
port: 2181
ASes:
"1-ff00:0:110": # old 1-11
core: true
Expand Down
4 changes: 0 additions & 4 deletions topology/Tiny.topo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
--- # Tiny Topology
defaults:
zookeepers:
1:
addr: 127.0.0.1
ASes:
"1-ff00:0:110": # old 1-11
core: true
Expand Down
5 changes: 0 additions & 5 deletions topology/Wide.topo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
---
defaults:
zookeepers:
1:
addr: 127.0.0.1

ASes:
"1-ff00:0:110": {core: true}
"1-ff00:0:120": {core: true}
Expand Down