network models

This commit is contained in:
Zhijun Zhao 2017-12-28 16:27:13 +08:00 committed by Matt Davis
commit 11c5d7b670
9 changed files with 71 additions and 85 deletions

View file

@ -129,7 +129,6 @@ state:
try:
from msrestazure.azure_exceptions import CloudError
from azure.mgmt.network.models import VirtualNetwork, AddressSpace, DhcpOptions
except ImportError:
# This is handled in azure_rm_common
pass
@ -295,14 +294,14 @@ class AzureRMVirtualNetwork(AzureRMModuleBase):
self.log("Create virtual network {0}".format(self.name))
if not self.address_prefixes_cidr:
self.fail('Parameter error: address_prefixes_cidr required when creating a virtual network')
vnet = VirtualNetwork(
vnet = self.network_models.VirtualNetwork(
location=self.location,
address_space=AddressSpace(
address_space=self.network_models.AddressSpace(
address_prefixes=self.address_prefixes_cidr
)
)
if self.dns_servers:
vnet.dhcp_options = DhcpOptions(
vnet.dhcp_options = self.network_models.DhcpOptions(
dns_servers=self.dns_servers
)
if self.tags:
@ -311,15 +310,15 @@ class AzureRMVirtualNetwork(AzureRMModuleBase):
else:
# update existing virtual network
self.log("Update virtual network {0}".format(self.name))
vnet = VirtualNetwork(
vnet = self.network_models.VirtualNetwork(
location=results['location'],
address_space=AddressSpace(
address_space=self.network_models.AddressSpace(
address_prefixes=results['address_prefixes']
),
tags=results['tags']
)
if results.get('dns_servers'):
vnet.dhcp_options = DhcpOptions(
vnet.dhcp_options = self.network_models.DhcpOptions(
dns_servers=results['dns_servers']
)
self.results['state'] = self.create_or_update_vnet(vnet)