Skip to content

Commit

Permalink
Using default domain/project for the logical router unittests.
Browse files Browse the repository at this point in the history
Related-Bug: 1473574
Related-Bug: 1455583

Change-Id: Id0c1f2e9426bfeb22109ef6910d92e3a3573d9a5
  • Loading branch information
cijohnson committed May 4, 2016
1 parent ea3bf53 commit 37e14cc
Showing 1 changed file with 8 additions and 34 deletions.
42 changes: 8 additions & 34 deletions src/config/api-server/tests/test_logical_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -386,30 +386,17 @@ def test_vm_port_not_added_to_lr(self):
logger.debug("*** test interface-add not allowing vm's port to be"
"attached to logical router ***")

# Create Domain
domain = Domain('my-lr-domain')
self._vnc_lib.domain_create(domain)
logger.debug('Created domain ')

# Create Project
project = Project('my-lr-proj', domain)
self._vnc_lib.project_create(project)
logger.debug('Created Project')

# Create NetworkIpam
ipam = NetworkIpam('default-network-ipam', project, IpamType("dhcp"))
self._vnc_lib.network_ipam_create(ipam)
logger.debug('Created network ipam')

ipam = self._vnc_lib.network_ipam_read(fq_name=['my-lr-domain', 'my-lr-proj',
project = self._vnc_lib.project_read(fq_name=['default-domain',
'default-project'])
ipam = self._vnc_lib.network_ipam_read(fq_name=['default-domain', 'default-project',
'default-network-ipam'])
logger.debug('Read network ipam')

# Create subnets
ipam_sn_v4_vn = IpamSubnetType(subnet=SubnetType('11.1.1.0', 24))

# Create VN my-vn
vn = VirtualNetwork('my-vn', project)
vn = VirtualNetwork('%s-vn' % self.id(), project)
vn.add_network_ipam(ipam, VnSubnetsType([ipam_sn_v4_vn]))
self._vnc_lib.virtual_network_create(vn)
logger.debug('Created Virtual Network object for my-vn: %s', vn.uuid)
Expand Down Expand Up @@ -488,30 +475,17 @@ def test_same_network_not_attached_to_lr(self):
"same network to be attached as both internal and external"
"network of logical router ***")

# Create Domain
domain = Domain('my-lr-domain')
self._vnc_lib.domain_create(domain)
logger.debug('Created domain ')

# Create Project
project = Project('my-lr-proj', domain)
self._vnc_lib.project_create(project)
logger.debug('Created Project')

# Create NetworkIpam
ipam = NetworkIpam('default-network-ipam', project, IpamType("dhcp"))
self._vnc_lib.network_ipam_create(ipam)
logger.debug('Created network ipam')

ipam = self._vnc_lib.network_ipam_read(fq_name=['my-lr-domain', 'my-lr-proj',
project = self._vnc_lib.project_read(fq_name=['default-domain',
'default-project'])
ipam = self._vnc_lib.network_ipam_read(fq_name=['default-domain', 'default-project',
'default-network-ipam'])
logger.debug('Read network ipam')

# Create subnets
ipam_sn_v4_vn = IpamSubnetType(subnet=SubnetType('11.1.1.0', 24))

# Create VN my-vn
vn = VirtualNetwork('my-vn', project)
vn = VirtualNetwork('%s-vn' % self.id(), project)
vn.add_network_ipam(ipam, VnSubnetsType([ipam_sn_v4_vn]))
self._vnc_lib.virtual_network_create(vn)
logger.debug('Created Virtual Network object for my-vn: %s', vn.uuid)
Expand Down

0 comments on commit 37e14cc

Please sign in to comment.