Set restart required to true for netwokr & VPC if router needs restart

Author: vishesh92

server/src/main/java/com/cloud/network/element/VirtualRouterElement.java

@@ -24,6 +24,9 @@
 
 import javax.inject.Inject;
 
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.vpc.VpcVO;
+import com.cloud.network.vpc.dao.VpcDao;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -125,6 +128,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
     @Inject
     NetworkDao _networksDao;
     @Inject
+    VpcDao _vpcDao;
+    @Inject
     NetworkModel _networkMdl;
     @Inject
     LoadBalancingRulesManager _lbMgr;
@@ -1369,6 +1374,7 @@ public void configureResource(Network network) {
             router.setUpdateState(VirtualRouter.UpdateState.UPDATE_NEEDED);
             _routerDao.persist(router);
         }
+        setRestartRequiredForNetwork(network, true);
     }
 
     @Override
@@ -1390,5 +1396,17 @@ private void updateToFailedState(Network network){
             router.setUpdateState(VirtualRouter.UpdateState.UPDATE_FAILED);
             _routerDao.persist(router);
         }
+        setRestartRequiredForNetwork(network, true);
+    }
+
+    private void setRestartRequiredForNetwork(Network network, boolean restartRequired) {
+        NetworkVO networkVo = _networksDao.findById(network.getId());
+        networkVo.setRestartRequired(restartRequired);
+        if (networkVo.getVpcId() == null) {
+            VpcVO vpc = _vpcDao.findById(networkVo.getVpcId());
+            vpc.setRestartRequired(restartRequired);
+            _vpcDao.persist(vpc);
+        }
+        _networksDao.persist(networkVo);
     }
 }

ui/src/components/page/GlobalLayout.vue

@@ -17,13 +17,15 @@
 
 <template>
   <div>
-    <a-affix v-if="getNumberOfAlerts() > 0" >
+    <a-affix v-if="alertCount > 0" >
       <a-alert
         v-if="this.$config.alertMessage && this.$config.alertMessage !== ''"
         :type="this.$config.alertMessageType ? this.$config.alertMessageType : 'info'"
         :showIcon="false"
         banner
-        class="alertHeader">
+        class="alertHeader"
+        closable
+        @close="closeCustomAlert()">
         <template #message>
           <span v-html="$config.alertMessage"></span>
         </template>
@@ -39,7 +41,7 @@
 
     </a-affix>
     <a-layout class="layout" :class="[device]">
-      <a-affix style="z-index: 200" :offsetTop="this.getNumberOfAlerts() * 25">
+      <a-affix style="z-index: 200" :offsetTop="alertCount * 25">
         <template v-if="isSideMenu()">
           <a-drawer
             v-if="isMobile()"
@@ -102,7 +104,7 @@
         <!-- layout header -->
         <a-affix style="z-index: 100">
           <global-header
-            :style="'margin-top: ' + this.getNumberOfAlerts() * 25 + 'px;'"
+            :style="'margin-top: ' + alertCount * 25 + 'px;'"
             :mode="layoutMode"
             :menus="menus"
             :theme="navTheme"
@@ -162,7 +164,8 @@ export default {
       collapsed: false,
       menus: [],
       showSetting: false,
-      showClear: false
+      showClear: false,
+      alertCount: 0
     }
   },
   computed: {
@@ -221,6 +224,7 @@ export default {
       const readyForShutdownPollingJob = setInterval(this.checkShutdown, 5000)
       this.$store.commit('SET_READY_FOR_SHUTDOWN_POLLING_JOB', readyForShutdownPollingJob)
     }
+    this.getNumberOfAlerts()
   },
   mounted () {
     const layoutMode = this.$config.theme['@layout-mode'] || 'light'
@@ -280,14 +284,18 @@ export default {
       })
     },
     getNumberOfAlerts () {
-      let count = 0
+      this.alertCount = 0
       if (this.$store.getters.shutdownTriggered) {
-        count++
+        this.alertCount++
       }
       if (this.$config.alertMessage && this.$config.alertMessage !== '') {
-        count++
+        this.alertCount++
       }
-      return count
+      return this.alertCount
+    },
+    closeCustomAlert () {
+      this.$config.alertMessage = ''
+      this.alertCount--
     }
   }
 }

ui/src/store/modules/user.js

@@ -348,14 +348,14 @@ const user = {
             reject(error)
           })
 
-          api('listNetworks', { restartrequired: true }).then(response => {
+          api('listNetworks', { restartrequired: true, forvpc: false }).then(response => {
             if (response.listnetworksresponse.count > 0) {
               store.dispatch('AddHeaderNotice', {
                 key: 'NETWORK_RESTART_REQUIRED',
                 title: i18n.global.t('label.network.restart.required'),
                 description: i18n.global.t('message.network.restart.required'),
                 path: '/guestnetwork/',
-                query: { restartrequired: true },
+                query: { restartrequired: true, forvpc: false },
                 status: 'done',
                 timestamp: new Date()
               })