1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00

F #6054: GOCA - make AR representation more generic

Signed-off-by: Pierre Lafievre <pierre.lafievre@iguanesolutions.com>
(cherry picked from commit afc90f70fe54f0f2b63df147fe23662faa2c9732)
(cherry picked from commit 462e888259363b1fd4c590d77c5c7b561b340856)
This commit is contained in:
Pierre Lafievre 2022-12-15 17:52:57 +01:00 committed by Ruben S. Montero
parent 4648c918b6
commit 35b43b32fc
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87

View File

@ -55,45 +55,8 @@ type VirtualNetwork struct {
Template Template `xml:"TEMPLATE"`
// Variable parts between one.vnpool.info and one.vn.info
ARs []AR `xml:"AR_POOL>AR,omitempty"`
Lock *shared.Lock `xml:"LOCK,omitempty"`
}
type AR struct {
ID string `xml:"AR_ID,omitempty"`
GlobalPrefix string `xml:"GLOBAL_PREFIX,omitempty"` // minOccurs=0
IP string `xml:"IP"` // minOccurs=0
MAC string `xml:"MAC,omitempty"`
ParentNetworkARID string `xml:"PARENT_NETWORK_AR_ID,omitempty"` // minOccurs=0
Size int `xml:"SIZE"`
Type string `xml:"TYPE"`
ULAPrefix string `xml:"ULA_PREFIX,omitempty"` // minOccurs=0
VNMAD string `xml:"VN_MAD,omitempty"` // minOccurs=0
MACEnd string `xml:"MAC_END,omitempty"`
IPEnd string `xml:"IP_END,omitempty"`
IP6ULA string `xml:"IP6_ULA,omitempty"`
IP6ULAEnd string `xml:"IP6_ULA_END,omitempty"`
IP6Global string `xml:"IP6_GLOBAL,omitempty"`
IP6GlobalEnd string `xml:"IP6_GLOBAL_END,omitempty"`
IP6 string `xml:"IP6,omitempty"`
IP6End string `xml:"IP6_END,omitempty"`
UsedLeases string `xml:"USED_LEASES,omitempty"`
Leases []Lease `xml:"LEASES>LEASE,omitempty"`
// Not filled with Info
Allocated string `xml:"ALLOCATED"`
}
type Lease struct {
IP string `xml:"IP,omitempty"`
IP6 string `xml:"IP6,omitempty"`
IP6Global string `xml:"IP6GLOBAL,omitempty"`
IP6Link string `xml:"IP6LINK,omitempty"`
IP6ULA string `xml:"IP6ULA,omitempty"`
MAC string `xml:"MAC,omitempty"`
VM int `xml:"VM,omitempty"`
VNet int `xml:"VNET,omitempty"`
VRouter int `xml:"VROUTER,omitempty"`
ARs []AddressRange `xml:"AR_POOL>AR,omitempty"`
Lock *shared.Lock `xml:"LOCK,omitempty"`
}
// State is the state of the Virtual Network