Update as suggested

Author: weizhouapache

api/src/main/java/com/cloud/network/Network.java

@@ -89,7 +89,7 @@ public static Routing fromValue(String type) {
             } else if (type.equalsIgnoreCase("Dynamic")) {
                 return Dynamic;
             } else {
-                throw new InvalidParameterValueException("Unexpected Routing type : " + type);
+                throw new InvalidParameterValueException("Unexpected Routing mode : " + type);
             }
         }
     }

api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java

@@ -296,7 +296,7 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
     private String internetProtocol;
 
     @SerializedName(ApiConstants.IPV6_ROUTING)
-    @Param(description = "The IPv6 routing type of network offering", since = "4.17.0")
+    @Param(description = "The IPv6 routing mode of network offering", since = "4.17.0")
     private String ipv6Routing;
 
     @SerializedName(ApiConstants.IPV6_ROUTES)
@@ -320,7 +320,7 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
     private String ipv6Dns2;
 
     @SerializedName(ApiConstants.IPV4_ROUTING)
-    @Param(description = "The IPv4 routing type of network", since = "4.20.0")
+    @Param(description = "The IPv4 routing mode of network", since = "4.20.0")
     private String ipv4Routing;
 
     @SerializedName(ApiConstants.IPV4_ROUTES)

api/src/main/java/org/apache/cloudstack/api/response/VpcResponse.java

@@ -166,7 +166,7 @@ public class VpcResponse extends BaseResponseWithAnnotations implements Controll
     private String ipv4Routing;
 
     @SerializedName(ApiConstants.IPV6_ROUTING)
-    @Param(description = "The Ipv6 routing type of VPC", since = "4.22.1")
+    @Param(description = "The IPv6 routing mode of VPC", since = "4.22.1")
     private String ipv6Routing;
 
     @SerializedName(ApiConstants.IPV4_ROUTES)

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -3586,16 +3586,14 @@ public VpcResponse createVpcResponse(ResponseView view, Vpc vpc) {
 
         // add IPv6 routes
         ipv6Service.updateIpv6RoutesForVpcResponse(vpc, response);
-        if (CollectionUtils.isNotEmpty(response.getIpv6Routes())) {
-            if (Objects.nonNull(asNumberVO)) {
-                response.setIpv6Routing(Network.Routing.Dynamic.name());
-            } else {
-                response.setIpv6Routing(Network.Routing.Static.name());
-            }
+        if (Objects.nonNull(asNumberVO)) {
+            response.setIpv6Routing(Network.Routing.Dynamic.name());
+        } else {
+            response.setIpv6Routing(Network.Routing.Static.name());
         }
 
         // Add BGP peer information for full view
-        if (view == ResponseView.Full) {
+        if (view == ResponseView.Full && Objects.nonNull(asNumberVO)) {
             List<BgpPeerVO> bgpPeerVOS = bgpPeerDao.listNonRevokeByVpcId(vpc.getId());
             for (BgpPeerVO bgpPeerVO : bgpPeerVOS) {
                 BgpPeerResponse bgpPeerResponse = routedIpv4Manager.createBgpPeerResponse(bgpPeerVO);

ui/src/views/infra/zone/BgpPeersTab.vue

@@ -18,15 +18,15 @@
 <template>
   <a-spin :spinning="componentLoading">
     <a-alert
-      v-if="this.resource.ip4routing || this.resource.ip6routing"
+      v-if="isIpRoutingEnabled()"
       type="info">
       <template #message>
         <div v-html="$t('message.bgp.peers.null')" />
       </template>
     </a-alert>
     <br>
     <a-button
-      v-if="!(this.resource.ip4routing || this.resource.ip6routing)"
+      v-if="!isIpRoutingEnabled()"
       :disabled="!('createBgpPeer' in $store.getters.apis)"
       type="primary"
       style="margin-bottom: 20px; width: 100%"
@@ -56,7 +56,7 @@
         <template v-if="column.key === 'project'">
           {{ record.project }}
         </template>
-        <template v-if="column.key === 'actions' && !(this.resource.ip4routing || this.resource.ip6routing)">
+        <template v-if="column.key === 'actions' && !isIpRoutingEnabled()">
           <div
             class="actions"
             style="text-align: right" >
@@ -103,7 +103,7 @@
       </template>
     </a-table>
     <a-pagination
-      v-if="!(this.resource.ip4routing || this.resource.ip6routing)"
+      v-if="!isIpRoutingEnabled()"
       class="row-element pagination"
       size="small"
       :current="bgpPeersPage"
@@ -318,7 +318,7 @@
 
     <br>
     <a-button
-      v-if="(this.resource.ip4routing || this.resource.ip6routing) && this.$route.meta.name === 'guestnetwork'"
+      v-if="isIpRoutingEnabled() && this.$route.meta.name === 'guestnetwork'"
       type="primary"
       style="margin-bottom: 20px; width: 100%"
       @click="() => { changeBgpPeersForNetworkModal = true }"
@@ -327,7 +327,7 @@
       {{ $t('label.change.bgp.peers') }}
     </a-button>
     <a-button
-      v-if="(this.resource.ip4routing || this.resource.ip6routing) && this.$route.meta.name === 'vpc'"
+      v-if="isIpRoutingEnabled() && this.$route.meta.name === 'vpc'"
       type="primary"
       style="margin-bottom: 20px; width: 100%"
       @click="() => { changeBgpPeersForVpcModal = true }"
@@ -456,6 +456,9 @@ export default {
         asnumber: [{ required: true, message: this.$t('label.required') }]
       })
     },
+    isIpRoutingEnabled () {
+      return !!(this.resource && (this.resource.ip4routing || this.resource.ip6routing))
+    },
     fetchDomains () {
       this.domainsLoading = true
       getAPI('listDomains', {
@@ -474,7 +477,7 @@ export default {
       })
     },
     fetchData () {
-      if (this.resource.ip4routing || this.resource.ip6routing) {
+      if (this.isIpRoutingEnabled()) {
         this.bgpPeers = this.resource.bgppeers
       } else {
         this.fetchZoneBgpPeer()