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

Jump to bottom

install: Ignore Cluster$interface deprecation #59

Merged
merged 1 commit into from
Nov 7, 2023
Merged

install: Ignore Cluster$interface deprecation #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ZeekControl/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ def use_port(self, node):

ostr = "# Automatically generated. Do not edit.\n"
ostr += "redef Cluster::manager_is_logger = %s;\n" % manager_is_logger
ostr += "@pragma push ignore-deprecations\n"
ostr += "redef Cluster::nodes = {\n"

# Control definition. For now just reuse the manager information.
Expand All @@ -211,6 +212,7 @@ def use_port(self, node):
ostr += '\t["time-machine"] = [$node_type=Cluster::TIME_MACHINE, $ip=%s, $p=%s],\n' % (config.Config.timemachinehost, config.Config.timemachineport)

ostr += "};\n"
ostr += "@pragma pop ignore-deprecations\n"

try:
with open(filename, "w") as out:
Expand Down
2 changes: 2 additions & 0 deletions testing/Baseline/command.install-layout-files/logger
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
# Automatically generated. Do not edit.
redef Cluster::manager_is_logger = F;
@pragma push ignore-deprecations
redef Cluster::nodes = {
["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=27760/tcp],
["logger"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=27761/tcp],
Expand All @@ -9,3 +10,4 @@ redef Cluster::nodes = {
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27764/tcp, $interface="eth0", $manager="manager"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27765/tcp, $interface="eth1", $manager="manager"],
};
@pragma pop ignore-deprecations
2 changes: 2 additions & 0 deletions testing/Baseline/command.install-layout-files/no-logger
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
# Automatically generated. Do not edit.
redef Cluster::manager_is_logger = T;
@pragma push ignore-deprecations
redef Cluster::nodes = {
["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=27760/tcp],
["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=27761/tcp],
["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=27762/tcp, $manager="manager"],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27763/tcp, $interface="eth0", $manager="manager"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27764/tcp, $interface="eth1", $manager="manager"],
};
@pragma pop ignore-deprecations
2 changes: 2 additions & 0 deletions testing/Baseline/command.install-layout-files/two-loggers
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
# Automatically generated. Do not edit.
redef Cluster::manager_is_logger = F;
@pragma push ignore-deprecations
redef Cluster::nodes = {
["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=27760/tcp],
["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=27761/tcp],
Expand All @@ -10,3 +11,4 @@ redef Cluster::nodes = {
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27765/tcp, $interface="eth0", $manager="manager"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27766/tcp, $interface="eth1", $manager="manager"],
};
@pragma pop ignore-deprecations
2 changes: 2 additions & 0 deletions testing/Baseline/command.install-zeekport/no-logger
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
# Automatically generated. Do not edit.
redef Cluster::manager_is_logger = T;
@pragma push ignore-deprecations
redef Cluster::nodes = {
["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=41234/tcp],
["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=41235/tcp],
["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=41236/tcp, $manager="manager"],
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41237/tcp, $interface="eth0", $manager="manager"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41238/tcp, $interface="eth1", $manager="manager"],
};
@pragma pop ignore-deprecations
2 changes: 2 additions & 0 deletions testing/Baseline/command.install-zeekport/two-loggers
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
# Automatically generated. Do not edit.
redef Cluster::manager_is_logger = F;
@pragma push ignore-deprecations
redef Cluster::nodes = {
["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=41234/tcp],
["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=41235/tcp],
Expand All @@ -10,3 +11,4 @@ redef Cluster::nodes = {
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41239/tcp, $interface="eth0", $manager="manager"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41240/tcp, $interface="eth1", $manager="manager"],
};
@pragma pop ignore-deprecations
2 changes: 2 additions & 0 deletions testing/Baseline/command.install-zeekport/two-proxies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
# Automatically generated. Do not edit.
redef Cluster::manager_is_logger = F;
@pragma push ignore-deprecations
redef Cluster::nodes = {
["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=41234/tcp],
["logger"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=41235/tcp],
Expand All @@ -10,3 +11,4 @@ redef Cluster::nodes = {
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41239/tcp, $interface="eth0", $manager="manager"],
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41240/tcp, $interface="eth1", $manager="manager"],
};
@pragma pop ignore-deprecations
Loading