Code Review
/
snaps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactoring of NetworkSettings to extend NetworkConfig
[snaps.git]
/
snaps
/
openstack
/
tests
/
openstack_tests.py
diff --git
a/snaps/openstack/tests/openstack_tests.py
b/snaps/openstack/tests/openstack_tests.py
index
ff64af5
..
78e8601
100644
(file)
--- a/
snaps/openstack/tests/openstack_tests.py
+++ b/
snaps/openstack/tests/openstack_tests.py
@@
-18,8
+18,8
@@
import re
import pkg_resources
from snaps import file_utils
from snaps.config.image import ImageConfig
import pkg_resources
from snaps import file_utils
from snaps.config.image import ImageConfig
+from snaps.config.network import NetworkConfig, SubnetConfig
from snaps.config.router import RouterConfig
from snaps.config.router import RouterConfig
-from snaps.openstack.create_network import NetworkSettings, SubnetSettings
from snaps.openstack.os_credentials import OSCreds, ProxySettings
__author__ = 'spisarski'
from snaps.openstack.os_credentials import OSCreds, ProxySettings
__author__ = 'spisarski'
@@
-338,11
+338,11
@@
class OSNetworkConfig:
router_name=None, external_gateway=None):
if subnet_name and subnet_cidr:
router_name=None, external_gateway=None):
if subnet_name and subnet_cidr:
- self.network_settings = Network
Settings
(
+ self.network_settings = Network
Config
(
name=net_name, subnet_settings=[
name=net_name, subnet_settings=[
- Subnet
Settings
(cidr=subnet_cidr, name=subnet_name)])
+ Subnet
Config
(cidr=subnet_cidr, name=subnet_name)])
else:
else:
- self.network_settings = Network
Settings
(name=net_name)
+ self.network_settings = Network
Config
(name=net_name)
if router_name:
if subnet_name:
if router_name:
if subnet_name: