From d113017c338c3a0b7bf68960e624aa4d45b5f606 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Fri, 24 Aug 2018 22:41:24 +0800 Subject: [PATCH] remove temp code --- pkg/compute/models/guests.go | 25 ------------------------- pkg/compute/models/hosts.go | 31 ------------------------------- 2 files changed, 56 deletions(-) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index aef8301dc4..713f5e88c9 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -3095,31 +3095,6 @@ func (self *SGuest) GetTemplateId() string { return "" } -// def get_short_desc(self, user_cred=None): -// desc = super(Guests, self).get_short_desc() -// desc['mem'] = self.vmem_size -// desc['cpu'] = self.vcpu_count -// template_id = self.get_template_id() -// if template_id is not None: -// desc['template_id'] = template_id -// ext_bw, int_bw = self.get_bandwidth() -// if ext_bw > 0: -// desc['ext_bandwidth'] = ext_bw -// if int_bw > 0: -// desc['int_bandwidth'] = int_bw -// hypervisor = self.get_hypervisor() -// desc['hypervisor'] = hypervisor -// spec = self.get_spec(user_cred, status_check=False) -// if hypervisor == self.HYPERVISOR_BAREMETAL: -// host = self.get_host() -// if host is not None: -// host_spec = '/'.join(host.get_spec_ident( -// host.get_spec(user_cred, status_check=False))) -// spec['host_spec'] = host_spec -// if spec is not None: -// desc.update(spec) -// return desc - func (self *SGuest) GetShortDesc() *jsonutils.JSONDict { desc := self.SStandaloneResourceBase.GetShortDesc() desc.Set("mem", jsonutils.NewInt(int64(self.VmemSize))) diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index 97ccecb6ef..0874133ba1 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -506,37 +506,6 @@ func (self *SHost) ClearSchedDescCache() error { return HostManager.ClearSchedDescCache(self.Id) } -// def get_spec(self, user_cred, status_check=True, **kwargs): -// if status_check: -// if self.status in [baremetalstatus.INIT, baremetalstatus.PREPARE_FAIL, -// baremetalstatus.PREPARE] or \ -// self.get_baremetal_server() is not None: -// return None -// if self.mem_size is None or self.cpu_count is None: -// return None -// from clouds.baremetal import nictypes -// spec = self.get_hardware_specification() -// spec.pop('storage_info', None) -// net_info = [] -// for netif in self.get_netifs(): -// net_desc = netif.get_baremetal_json_desc() -// if net_desc.get('nic_type', None) != nictypes.NIC_TYPE_IPMI: -// net_info.append(net_desc) -// spec['nic_count'] = len(net_info) -// spec['manufacture'] = self.sys_info.get('manufacture', 'Unknown') -// spec['model'] = self.sys_info.get('model', 'Unknown') -// return spec -// def get_hardware_specification(self): -// spec = {} -// spec['cpu'] = self.cpu_count -// spec['mem'] = self.mem_size -// if self.storage_info: -// from clouds.baremetal import diskconfig -// spec['disk'] = diskconfig.get_disk_spec_v2(self.storage_info) -// spec['driver'] = self.storage_driver -// spec['storage_info'] = self.storage_info -// return spec - func (self *SHost) GetSpec(statusCheck bool) *jsonutils.JSONDict { if statusCheck { if utils.IsInStringArray(self.Status, []string{BAREMETAL_INIT, BAREMETAL_PREPARE_FAIL, BAREMETAL_PREPARE}) ||