Просмотр исходного кода

Fixes network backward compatibility issue

George Vrancianu 8 лет назад
Родитель
Сommit
e960c56ddf

+ 21 - 7
src/components/MigrationNetworks/MigrationNetworks.js

@@ -52,7 +52,7 @@ class MigrationNetworks extends Component {
     let vms = []
     let vms = []
     for (let instanceName in this.props.migration.info) {
     for (let instanceName in this.props.migration.info) {
       let instance = this.props.migration.info[instanceName]
       let instance = this.props.migration.info[instanceName]
-      if (instance.export_info.devices.nics.length) {
+      if (instance.export_info && instance.export_info.devices.nics.length) {
         instance.export_info.devices.nics.forEach(nic => {
         instance.export_info.devices.nics.forEach(nic => {
           if (nic.network_name == networkId) {
           if (nic.network_name == networkId) {
             vms.push(instanceName)
             vms.push(instanceName)
@@ -60,17 +60,31 @@ class MigrationNetworks extends Component {
         })
         })
       }
       }
     }
     }
-    return vms
+    if (vms.length == 0) {
+      return "-"
+    } else {
+      return vms
+    }
   }
   }
 
 
   processProps(props) {
   processProps(props) {
     if (props.migration && props.migration.destination_environment) {
     if (props.migration && props.migration.destination_environment) {
       for (let i in props.migration.destination_environment.network_map) {
       for (let i in props.migration.destination_environment.network_map) {
-        let newItem = {
-          source_network: i,
-          connected_vms: this.getConnectedVms(i),
-          destination_network: props.migration.destination_environment.network_map[i],
-          destination_type: "Existing network"
+        let newItem
+        if (typeof props.migration.destination_environment.network_map[i] == "object") {
+          newItem = {
+            source_network: props.migration.destination_environment.network_map[i].source_network,
+            connected_vms: this.getConnectedVms(i),
+            destination_network: props.migration.destination_environment.network_map[i].destination_network,
+            destination_type: "Existing network"
+          }
+        } else {
+          newItem = {
+            source_network: i,
+            connected_vms: this.getConnectedVms(i),
+            destination_network: props.migration.destination_environment.network_map[i],
+            destination_type: "Existing network"
+          }
         }
         }
         this.listItems.push(newItem)
         this.listItems.push(newItem)
       }
       }

+ 1 - 0
src/components/ReplicaView/ReplicaView.js

@@ -55,6 +55,7 @@ class ReplicaView extends Reflux.Component {
 
 
   componentWillMount() {
   componentWillMount() {
     super.componentWillMount.call(this)
     super.componentWillMount.call(this)
+
     MigrationActions.setReplica(this.props.replicaId)
     MigrationActions.setReplica(this.props.replicaId)
   }
   }