Revision 6de25206 snf-cyclades-app/synnefo/logic/rapi.py
| b/snf-cyclades-app/synnefo/logic/rapi.py | ||
|---|---|---|
| 1659 | 1659 |
|
| 1660 | 1660 |
def CreateNetwork(self, network_name, network, gateway=None, network6=None, |
| 1661 | 1661 |
gateway6=None, mac_prefix=None, network_type=None, |
| 1662 |
tags=None, dry_run=False): |
|
| 1662 |
tags=None, conflicts_check=False, dry_run=False):
|
|
| 1663 | 1663 |
"""Creates a new network. |
| 1664 | 1664 |
|
| 1665 | 1665 |
@type name: str |
| ... | ... | |
| 1688 | 1688 |
"network6": network6, |
| 1689 | 1689 |
"mac_prefix": mac_prefix, |
| 1690 | 1690 |
"network_type": network_type, |
| 1691 |
"tags": tags |
|
| 1691 |
"tags": tags, |
|
| 1692 |
"conflicts_check": conflicts_check, |
|
| 1692 | 1693 |
} |
| 1693 | 1694 |
|
| 1694 | 1695 |
return self._SendRequest(HTTP_POST, "/%s/networks" % GANETI_RAPI_VERSION, |
| 1695 | 1696 |
query, body) |
| 1696 | 1697 |
|
| 1697 |
def ConnectNetwork(self, network_name, group_name, mode, link, depends=None): |
|
| 1698 |
def ConnectNetwork(self, network_name, group_name, mode, link, |
|
| 1699 |
conflicts_check=False, depends=None): |
|
| 1698 | 1700 |
"""Connects a Network to a NodeGroup with the given netparams |
| 1699 | 1701 |
|
| 1700 | 1702 |
""" |
| 1701 | 1703 |
body = {
|
| 1702 | 1704 |
"group_name": group_name, |
| 1703 | 1705 |
"network_mode": mode, |
| 1704 |
"network_link": link |
|
| 1706 |
"network_link": link, |
|
| 1707 |
"conflicts_check": conflicts_check, |
|
| 1705 | 1708 |
} |
| 1706 | 1709 |
|
| 1707 | 1710 |
if depends: |
Also available in: Unified diff