Skip to content

Commit

Permalink
Replacing 'cirros-0.3.0-x86_64-uec' with 'cirros'
Browse files Browse the repository at this point in the history 
Change-Id: I375b6447f3dc67eab57d832e93d5f77dc3c66eab
  • Loading branch information
@ganeshahv
ganeshahv committed Feb 14, 2017
1 parent 641843c commit 18f57b5
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions common/heat/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,10 @@ def config_v2_svc_chain(self, stack_name):
self.update_stack(svc_pt_hs, change_sets=[['left_vn_fqdn', left_vn_fqdn], ['right_vn_fqdn', right_vn_fqdn], ['service_instance1_fq_name', si_fqdn], ['service_instance2_fq_name', si2_fqdn]])
else:
self.update_stack(svc_pt_hs, change_sets=[['left_vn_fqdn', left_vn_fqdn], ['right_vn_fqdn', right_vn_fqdn], ['service_instance_fq_name', si_fqdn]])
left_vm = VMFixture(connections=self.connections,uuid = left_vm_id, image_name = 'cirros-0.3.0-x86_64-uec')
left_vm = VMFixture(connections=self.connections,uuid = left_vm_id, image_name = 'cirros')
left_vm.read()
left_vm.verify_on_setup()
right_vm = VMFixture(connections=self.connections,uuid = right_vm_id, image_name = 'cirros-0.3.0-x86_64-uec')
right_vm = VMFixture(connections=self.connections,uuid = right_vm_id, image_name = 'cirros')
right_vm.read()
right_vm.verify_on_setup()
assert left_vm.ping_with_certainty(right_vm.vm_ip, expectation=True)
Expand Down
6 changes: 3 additions & 3 deletions common/heat/env.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"network_policy_entries_policy_rule_src_addresses_subnet_ip_prefix_len": "32",
# VM config
"flavor": "contrail_flavor_tiny",
"image": "cirros-0.3.0-x86_64-uec",
"image": "cirros",
"left_vm1_name": "left_vm1",
"left_vm2_name": "left_vm2",
"right_vm_name": "right_vm",
Expand Down Expand Up @@ -66,7 +66,7 @@
"protocol": "any",
"service_template_properties_version": 2,
"svm2_name": "pt_svm2",
"image": "cirros-0.3.0-x86_64-uec",
"image": "cirros",
"dst_port_start": -1,
"service_template_properties_service_type": "firewall",
"service_template_properties_service_mode": "in-network-nat",
Expand Down Expand Up @@ -142,7 +142,7 @@
"network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len_1": 24,
"service_template_properties_interface_type_service_interface_type_1":
"management",
"image": "cirros-0.3.0-x86_64-uec",
"image": "cirros",
"src_port_end": -1,
"service_instance2_fq_name": "",
"service_template2_properties_image_name": "tiny_nat_fw",
Expand Down
16 changes: 8 additions & 8 deletions scripts/neutron/lbaas/test_lbaas_basic.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ def test_lbmethod_round_robin(self):
vn_vip_fixture = self.create_vn(vn_vip, vn_vip_subnets)
assert vn_vip_fixture.verify_on_setup()
pool_vm1_fixture = self.create_vm(vn_pool_fixture,vm_name=pool_vm1,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')
pool_vm2_fixture = self.create_vm(vn_pool_fixture,vm_name=pool_vm2,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')
pool_vm3_fixture = self.create_vm(vn_pool_fixture,vm_name=pool_vm3,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')
client_vm1_fixture = self.create_vm(vn_vip_fixture,vm_name=client_vm1,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')

lb_pool_servers = [pool_vm1_fixture, pool_vm2_fixture, pool_vm3_fixture]

Expand Down Expand Up @@ -158,13 +158,13 @@ def test_healthmonitor(self):
vn_vip_fixture = vn_pool_fixture
assert vn_vip_fixture.verify_on_setup()
pool_vm1_fixture = self.create_vm(vn_pool_fixture,vm_name=pool_vm1,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')
pool_vm2_fixture = self.create_vm(vn_pool_fixture,vm_name=pool_vm2,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')
pool_vm3_fixture = self.create_vm(vn_pool_fixture,vm_name=pool_vm3,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')
client_vm1_fixture = self.create_vm(vn_vip_fixture,vm_name=client_vm1,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')

lb_pool_servers = [pool_vm1_fixture, pool_vm2_fixture, pool_vm3_fixture]

Expand Down
4 changes: 2 additions & 2 deletions scripts/neutron/test_routers_basic.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_basic_snat_behavior_without_external_connectivity(self):
vn1_fixture = self.create_vn(vn1_name, vn1_subnets)
vn1_fixture.verify_on_setup()
vm1_fixture = self.create_vm(vn1_fixture, vm1_name,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')
vm1_fixture.wait_till_vm_is_up()

ext_vn_name = get_random_name('ext_vn')
Expand All @@ -56,7 +56,7 @@ def test_basic_snat_behavior_without_external_connectivity(self):

vm2_name = get_random_name('vm_right')
vm2_fixture = self.create_vm(ext_vn_fixture, vm2_name,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')
vm2_fixture.wait_till_vm_is_up()

router_name = get_random_name('router1')
Expand Down
2 changes: 1 addition & 1 deletion serial_scripts/rbac/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def create_vm(self, vn_fixture, connections=None, verify=True):
connections = connections or self.connections
vm_fixture = self.create_fixture(VMFixture, connections=connections,
vn_obj=vn_fixture.obj,
image_name='cirros-0.3.0-x86_64-uec')
image_name='cirros')
if vm_fixture and verify:
assert vm_fixture.verify_on_setup(), 'VM verification failed'
return vm_fixture
Expand Down

0 comments on commit 18f57b5

Please sign in to comment.