openstack/heat
Code Issues Proposed changes

Merge "Unit tests: remove dead code from Neutron Autoscaling test"

Browse Source
This commit is contained in:
Jenkins
2014-10-16 08:52:42 +00:00
committed by Gerrit Code Review
parent 01219b45b6 5a0538e417
commit 80ec18b263
1 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
heat/tests/test_neutron_autoscaling.py
View File

@@ -197,20 +197,6 @@ class AutoScalingTest(HeatTestCase):
vip_ret_block['vip']['id'] = str(uuid.uuid4()) vip_ret_block['vip']['id'] = str(uuid.uuid4())
vip_ret_block['vip']['status'] = 'ACTIVE' vip_ret_block['vip']['status'] = 'ACTIVE'
port_block = {
'port': {
'network_id': network_body['network']['id'],
'fixed_ips': [
{
'subnet_id': subnet_body['subnet']['id'],
}
],
'admin_state_up': True
}
}
port_ret_block = copy.deepcopy(port_block)
port_ret_block['port']['id'] = str(uuid.uuid4())
membera_block = { membera_block = {
'member': { 'member': {
'protocol_port': 8080, 'protocol_port': 8080,
@@ -241,14 +227,6 @@ class AutoScalingTest(HeatTestCase):
memberc_ret_block = copy.deepcopy(memberc_block) memberc_ret_block = copy.deepcopy(memberc_block)
memberc_ret_block['member']['id'] = str(uuid.uuid4()) memberc_ret_block['member']['id'] = str(uuid.uuid4())
class id_type(object):
def __init__(self, id, name):
self.id = id
self.name = name
instances = {}
neutronclient.Client.create_health_monitor(mon_block).\ neutronclient.Client.create_health_monitor(mon_block).\
AndReturn(mon_ret_block) AndReturn(mon_ret_block)
@@ -287,8 +265,6 @@ class AutoScalingTest(HeatTestCase):
neutronclient.Client.create_member(membera_block).\ neutronclient.Client.create_member(membera_block).\
AndReturn(membera_ret_block) AndReturn(membera_ret_block)
instances[instid] = membera_ret_block['member']['id']
# Start of update # Start of update
parser.Stack.validate() parser.Stack.validate()
instid = str(uuid.uuid4()) instid = str(uuid.uuid4())
@@ -297,7 +273,6 @@ class AutoScalingTest(HeatTestCase):
.AndReturn(False) .AndReturn(False)
instance.Instance.check_create_complete(mox.IgnoreArg())\ instance.Instance.check_create_complete(mox.IgnoreArg())\
.AndReturn(True) .AndReturn(True)
instances[instid] = memberb_ret_block['member']['id']
instid = str(uuid.uuid4()) instid = str(uuid.uuid4())
instance.Instance.handle_create().AndReturn(instid) instance.Instance.handle_create().AndReturn(instid)