diff --git a/Pipfile.lock b/Pipfile.lock index b545bdd2d96d32069a297f4c8c38934e6ff4654d..e8627d6677161f0b8d7c2f6751a0bb7fbe9ca19f 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -23,14 +23,14 @@ "default": { "kypo-topology-definition": { "index": "kypo", - "version": "==0.5.5" + "version": "==0.5.6" }, "netaddr": { "hashes": [ - "sha256:9666d0232c32d2656e5e5f8d735f58fd6c7457ce52fc21c98d45f2af78f990ac", - "sha256:d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243" + "sha256:5148b1055679d2a1ec070c521b7db82137887fabd6d7e37f5199b44f775c3bb1", + "sha256:7b46fa9b1a2d71fd5de9e4a3784ef339700a53a08c8040f08baf5f1194da0128" ], - "version": "==0.8.0" + "version": "==0.9.0" }, "ruamel.yaml": { "hashes": [ @@ -56,7 +56,6 @@ "sha256:4a4d8d417868d68b979076a9be6a38c676eca060785abaa6709c7b31593c35d1", "sha256:4b3a93bb9bc662fc1f99c5c3ea8e623d8b23ad22f861eb6fce9377ac07ad6072", "sha256:5bc0667c1eb8f83a3752b71b9c4ba55ef7c7058ae57022dd9b29065186a113d9", - "sha256:721bc4ba4525f53f6a611ec0967bdcee61b31df5a56801281027a3a6d1c2daf5", "sha256:763d65baa3b952479c4e972669f679fe490eee058d5aa85da483ebae2009d231", "sha256:7bdb4c06b063f6fd55e472e201317a3bb6cdeeee5d5a38512ea5c01e1acbdd93", "sha256:8831a2cedcd0f0927f788c5bdf6567d9dc9cc235646a434986a852af1cb54b4b", @@ -81,7 +80,7 @@ "sha256:f34019dced51047d6f70cb9383b2ae2853b7fc4dce65129a5acd49f4f9256646", "sha256:f6d3d39611ac2e4f62c3128a9eed45f19a6608670c5a2f4f07f24e8de3441d38" ], - "markers": "python_version < '3.12' and platform_python_implementation == 'CPython'", + "markers": "platform_python_implementation == 'CPython' and python_version < '3.12'", "version": "==0.2.7" }, "structlog": { diff --git a/kypo/cloud_commons/topology_instance.py b/kypo/cloud_commons/topology_instance.py index b66696bb531eb6c6952032248b66b81b08f7e7f2..2f080f818e41102fdec38973484948e4cf065704 100644 --- a/kypo/cloud_commons/topology_instance.py +++ b/kypo/cloud_commons/topology_instance.py @@ -4,7 +4,7 @@ import yaml from kypo.topology_definition.models \ import TopologyDefinition, NetworkMappingList, RouterList, RouterMappingList, \ - Group, Network, Host, Router, DockerContainers + Group, Network, Host, Router, DockerContainers, MonitoringTarget from kypo.cloud_commons.transformation_configuration \ import TransformationConfiguration @@ -113,6 +113,13 @@ class TopologyInstance: """ return self.topology_definition.networks + def get_monitored_hosts(self) -> List[MonitoringTarget]: + """ + Return a list of monitored hosts and their monitored + interfaces/ports. + """ + return self.topology_definition.monitoring_targets + def get_user_accessible_hosts_networks(self) -> List[Network]: """ Return a list of TI user-defined Networks that are accessible to a user. @@ -263,6 +270,7 @@ class TopologyInstance: 'man_network': str(self.man_network), 'links': [str(link) for link in self.get_links()], 'groups': [str(group) for group in self.get_groups()], + 'monitoring_targets': [str(monitored_host) for monitored_host in self.get_monitored_hosts()], } if self.ip: ret['ip'] = self.ip