Use name from topology in container name
This commit is contained in:
parent
21afacc96c
commit
9a5b6a996d
1 changed files with 16 additions and 14 deletions
|
@ -35,7 +35,7 @@ def requires_id_in_link_range(func):
|
||||||
|
|
||||||
|
|
||||||
class Topology:
|
class Topology:
|
||||||
""" A generic network topology """
|
"""A generic network topology"""
|
||||||
|
|
||||||
class InvalidConfiguration(Exception):
|
class InvalidConfiguration(Exception):
|
||||||
def __init__(self, reason):
|
def __init__(self, reason):
|
||||||
|
@ -58,7 +58,7 @@ class Topology:
|
||||||
@requires_parsed
|
@requires_parsed
|
||||||
@requires_id_in_link_range
|
@requires_id_in_link_range
|
||||||
def net_setstate_single(self, link_id, state, verbose=False, verbose_inline=False):
|
def net_setstate_single(self, link_id, state, verbose=False, verbose_inline=False):
|
||||||
""" Start or stop a single network.
|
"""Start or stop a single network.
|
||||||
* `net_id`: the link to be affected
|
* `net_id`: the link to be affected
|
||||||
* `verbose`: if true, prints progress
|
* `verbose`: if true, prints progress
|
||||||
"""
|
"""
|
||||||
|
@ -91,7 +91,7 @@ class Topology:
|
||||||
@requires_parsed
|
@requires_parsed
|
||||||
@requires_id_in_dom_range
|
@requires_id_in_dom_range
|
||||||
def dom_setstate_single(self, dom_id, state, verbose=False, verbose_inline=False):
|
def dom_setstate_single(self, dom_id, state, verbose=False, verbose_inline=False):
|
||||||
""" Start or stop a single domain.
|
"""Start or stop a single domain.
|
||||||
* `dom_id`: the domain to be affected
|
* `dom_id`: the domain to be affected
|
||||||
* `verbose`: if true, prints progress
|
* `verbose`: if true, prints progress
|
||||||
"""
|
"""
|
||||||
|
@ -135,7 +135,7 @@ class Topology:
|
||||||
|
|
||||||
@requires_parsed
|
@requires_parsed
|
||||||
def net_setstate(self, state, verbose=False):
|
def net_setstate(self, state, verbose=False):
|
||||||
""" Start or stop the networks.
|
"""Start or stop the networks.
|
||||||
* `verbose`: if true, prints progress
|
* `verbose`: if true, prints progress
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
@ -151,7 +151,7 @@ class Topology:
|
||||||
|
|
||||||
@requires_parsed
|
@requires_parsed
|
||||||
def dom_setstate(self, state, verbose=False):
|
def dom_setstate(self, state, verbose=False):
|
||||||
""" Start or stop the domains.
|
"""Start or stop the domains.
|
||||||
* `verbose`: if true, prints progress
|
* `verbose`: if true, prints progress
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
@ -188,9 +188,9 @@ del requires_parsed
|
||||||
|
|
||||||
|
|
||||||
class YamlTopology(Topology):
|
class YamlTopology(Topology):
|
||||||
""" Parse a YAML description of a network topology. The networks' links and domains
|
"""Parse a YAML description of a network topology. The networks' links and domains
|
||||||
are contained in the `links` and `domains` attributes, but their `create` methods
|
are contained in the `links` and `domains` attributes, but their `create` methods
|
||||||
are not called. """
|
are not called."""
|
||||||
|
|
||||||
def __init__(self, path, conn):
|
def __init__(self, path, conn):
|
||||||
super().__init__(conn)
|
super().__init__(conn)
|
||||||
|
@ -215,7 +215,8 @@ class YamlTopology(Topology):
|
||||||
)
|
)
|
||||||
|
|
||||||
cur_link = network.Network(
|
cur_link = network.Network(
|
||||||
self.conn, enable_v4=link_conf.get("enable_v4", True),
|
self.conn,
|
||||||
|
enable_v4=link_conf.get("enable_v4", True),
|
||||||
)
|
)
|
||||||
self.links.append(cur_link)
|
self.links.append(cur_link)
|
||||||
|
|
||||||
|
@ -246,6 +247,7 @@ class YamlTopology(Topology):
|
||||||
self.conn,
|
self.conn,
|
||||||
dom_descr[dom]["links"],
|
dom_descr[dom]["links"],
|
||||||
enable_v4=dom_descr[dom].get("enable_v4", True),
|
enable_v4=dom_descr[dom].get("enable_v4", True),
|
||||||
|
name=dom,
|
||||||
)
|
)
|
||||||
for dom in sorted_dom_names
|
for dom in sorted_dom_names
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in a new issue