From 1dfd5827c17958b3563eb8b986de322fac047ce6 Mon Sep 17 00:00:00 2001
From: zhongcan <657688162@qq.com>
Date: Thu, 16 May 2019 11:15:43 +0800
Subject: [PATCH] The region service adds restful-list to display zone and
 zone_id information.

---
 pkg/compute/models/networks.go       | 5 +++++
 pkg/compute/models/wires.go          | 5 ++++-
 pkg/mcclient/modules/mod_networks.go | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go
index 35ca640dfb..adce4ec62e 100644
--- a/pkg/compute/models/networks.go
+++ b/pkg/compute/models/networks.go
@@ -861,6 +861,11 @@ func (self *SNetwork) GetPorts() int {
 
 func (self *SNetwork) getMoreDetails(ctx context.Context, extra *jsonutils.JSONDict) *jsonutils.JSONDict {
 	wire := self.GetWire()
+	zone := self.getZone()
+	if zone != nil {
+		extra.Add(jsonutils.NewString(zone.Name), "zone")
+		extra.Add(jsonutils.NewString(zone.Id), "zone_id")
+	}
 	extra.Add(jsonutils.NewString(wire.Name), "wire")
 	if self.IsExitNetwork() {
 		extra.Add(jsonutils.JSONTrue, "exit")
diff --git a/pkg/compute/models/wires.go b/pkg/compute/models/wires.go
index 0bbef70760..70c3ebf9b5 100644
--- a/pkg/compute/models/wires.go
+++ b/pkg/compute/models/wires.go
@@ -669,7 +669,6 @@ func (manager *SWireManager) GetOnPremiseWireOfIp(ipAddr string) (*SWire, error)
 
 func (manager *SWireManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*sqlchemy.SQuery, error) {
 	var err error
-
 	q, err = managedResourceFilterByAccount(q, query, "vpc_id", func() *sqlchemy.SQuery {
 		vpcs := VpcManager.Query().SubQuery()
 		subq := vpcs.Query(vpcs.Field("id"))
@@ -786,6 +785,10 @@ func (self *SWire) GetExtraDetails(ctx context.Context, userCred mcclient.TokenC
 
 func (self *SWire) getMoreDetails(extra *jsonutils.JSONDict) *jsonutils.JSONDict {
 	cnt, _ := self.NetworkCount()
+	zone := self.GetZone()
+	if zone != nil {
+		extra.Add(jsonutils.NewString(string(zone.Name)), "zone")
+	}
 	extra.Add(jsonutils.NewInt(int64(cnt)), "networks")
 	vpc := self.getVpc()
 	if vpc != nil {
diff --git a/pkg/mcclient/modules/mod_networks.go b/pkg/mcclient/modules/mod_networks.go
index 90f67e8a77..654fa784c9 100644
--- a/pkg/mcclient/modules/mod_networks.go
+++ b/pkg/mcclient/modules/mod_networks.go
@@ -20,7 +20,7 @@ var (
 
 func init() {
 	Networks = NewComputeManager("network", "networks",
-		[]string{"ID", "Name", "Guest_ip_start",
+		[]string{"ID", "Name", "Guest_ip_start", "zone", "zone_id",
 			"Guest_ip_end", "Guest_ip_mask",
 			"wire_id", "wire", "is_public", "exit", "Ports",
 			"vnics", "guest_gateway",