opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

guestnetworks: nic desc for onecloud vpc

Browse Source
This commit is contained in:
Yousong Zhou
2020-01-17 17:45:07 +08:00
parent 54783f601a
commit 4221e214f0
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/vpcs_const.go
+4
View File
@@ -70,3 +70,7 @@ type WireListInput struct {
type GlobalVpcListInput struct {
apis.EnabledStatusStandaloneResourceListInput
}
const (
VPC_PROVIDER_OVN = "ovn"
)
pkg/compute/models/guestnetworks.go
+26 -9
View File
@@ -337,7 +337,7 @@ func (self *SGuestnetwork) GetTeamGuestnetwork() (*SGuestnetwork, error) {
func (self *SGuestnetwork) getJsonDescAtBaremetal(host *SHost) jsonutils.JSONObject {
network := self.GetNetwork()
hostwire := host.getHostwireOfIdAndMac(network.WireId, self.MacAddr)
return self.getGeneralJsonDesc(host, network, hostwire)
return self.getJsonDescHostwire(network, hostwire)
}
func guestGetHostWireFromNetwork(host *SHost, network *SNetwork) (*SHostwire, error) {
@@ -360,14 +360,34 @@ func guestGetHostWireFromNetwork(host *SHost, network *SNetwork) (*SHostwire, er
func (self *SGuestnetwork) getJsonDescAtHost(host *SHost) jsonutils.JSONObject {
network := self.GetNetwork()
hostWire, err := guestGetHostWireFromNetwork(host, network)
if err != nil {
log.Errorln(err)
if network.isOneCloudVpcNetwork() {
return self.getJsonDescOneCloudVpc(network)
} else {
hostWire, err := guestGetHostWireFromNetwork(host, network)
if err != nil {
log.Errorln(err)
}
return self.getJsonDescHostwire(network, hostWire)
}
return self.getGeneralJsonDesc(host, network, hostWire)
}
func (self *SGuestnetwork) getGeneralJsonDesc(host *SHost, network *SNetwork, hostwire *SHostwire) jsonutils.JSONObject {
func (self *SGuestnetwork) getJsonDescHostwire(network *SNetwork, hostwire *SHostwire) *jsonutils.JSONDict {
desc := self.getJsonDesc(network)
desc.Add(jsonutils.NewString(hostwire.Bridge), "bridge")
desc.Add(jsonutils.NewString(hostwire.WireId), "wire_id")
desc.Add(jsonutils.NewString(hostwire.Interface), "interface")
return desc
}
func (self *SGuestnetwork) getJsonDescOneCloudVpc(network *SNetwork) *jsonutils.JSONDict {
vpcDesc := jsonutils.NewDict()
vpcDesc.Set("provider", jsonutils.NewString(api.VPC_PROVIDER_OVN))
desc := self.getJsonDesc(network)
desc.Set("vpc", vpcDesc)
return desc
}
func (self *SGuestnetwork) getJsonDesc(network *SNetwork) *jsonutils.JSONDict {
desc := jsonutils.NewDict()
desc.Add(jsonutils.NewString(network.Name), "net")
@@ -400,10 +420,7 @@ func (self *SGuestnetwork) getGeneralJsonDesc(host *SHost, network *SNetwork, ho
desc.Add(jsonutils.NewString(self.GetIfname()), "ifname")
desc.Add(jsonutils.NewInt(int64(network.GuestIpMask)), "masklen")
desc.Add(jsonutils.NewString(self.Driver), "driver")
desc.Add(jsonutils.NewString(hostwire.Bridge), "bridge")
desc.Add(jsonutils.NewString(hostwire.WireId), "wire_id")
desc.Add(jsonutils.NewInt(int64(network.VlanId)), "vlan")
desc.Add(jsonutils.NewString(hostwire.Interface), "interface")
desc.Add(jsonutils.NewInt(int64(self.getBandwidth())), "bw")
desc.Add(jsonutils.NewInt(int64(self.getMtu())), "mtu")
desc.Add(jsonutils.NewInt(int64(self.Index)), "index")