Revision 48616625 lib/objects.py
| b/lib/objects.py | ||
|---|---|---|
| 2035 | 2035 |
"name", |
| 2036 | 2036 |
"serial_no", |
| 2037 | 2037 |
"mac_prefix", |
| 2038 |
"family", |
|
| 2039 | 2038 |
"network", |
| 2040 | 2039 |
"network6", |
| 2041 | 2040 |
"gateway", |
| 2042 | 2041 |
"gateway6", |
| 2043 |
"size", |
|
| 2044 | 2042 |
"reservations", |
| 2045 | 2043 |
"ext_reservations", |
| 2046 | 2044 |
] + _TIMESTAMPS + _UUID |
| ... | ... | |
| 2055 | 2053 |
result = {
|
| 2056 | 2054 |
"%sNETWORK" % prefix: self.name, |
| 2057 | 2055 |
"%sNETWORK_UUID" % prefix: self.uuid, |
| 2058 |
"%sNETWORK_FAMILY" % prefix: str(self.family), |
|
| 2059 | 2056 |
"%sNETWORK_TAGS" % prefix: " ".join(self.tags), |
| 2060 | 2057 |
} |
| 2061 | 2058 |
if self.network: |
| ... | ... | |
| 2075 | 2072 |
def FromDict(cls, val): |
| 2076 | 2073 |
"""Custom function for networks. |
| 2077 | 2074 |
|
| 2078 |
Remove deprecated network_type. Still this info can be passed via tags.
|
|
| 2075 |
Remove deprecated network_type and family.
|
|
| 2079 | 2076 |
|
| 2080 | 2077 |
""" |
| 2081 | 2078 |
if "network_type" in val: |
| 2082 | 2079 |
del val["network_type"] |
| 2080 |
if "family" in val: |
|
| 2081 |
del val["family"] |
|
| 2083 | 2082 |
obj = super(Network, cls).FromDict(val) |
| 2084 | 2083 |
return obj |
| 2085 | 2084 |
|
Also available in: Unified diff