Skip to content

Commit

Permalink
Merge "Automatic network create for vrouter-instance"
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Nov 3, 2015
2 parents 84ef046 + 60d1c20 commit 546289f
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions src/config/svc-monitor/svc_monitor/virtual_machine_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,27 +68,6 @@ def _create_service_vm(self, instance_index, si, st):
self.link_si_to_vm(si, st, instance_index, nova_vm.id)
return nova_vm.id

def _check_create_service_vn(self, itf_type, si):
vn_id = None

# search or create shared vn
funcname = "get_" + itf_type + "_vn_name"
func = getattr(svc_info, funcname)
service_vn_name = func()
funcname = "get_" + itf_type + "_vn_subnet"
func = getattr(svc_info, funcname)
service_vn_subnet = func()

vn_fq_name = si.fq_name[:-1] + [service_vn_name]
try:
vn_id = self._vnc_lib.fq_name_to_id(
'virtual-network', vn_fq_name)
except NoIdError:
vn_id = self.create_service_vn(service_vn_name,
service_vn_subnet, si.fq_name[:-1])

return vn_id

def _validate_nova_objects(self, st, si):
# check image and flavor
si.flavor = st.params.get('flavor', None)
Expand Down

0 comments on commit 546289f

Please sign in to comment.