Skip to content

Commit

Permalink
fix checking empty nics when starting a vm
Browse files Browse the repository at this point in the history
  • Loading branch information
zxwing committed Mar 9, 2016
1 parent c57bfb8 commit ada3db8
Show file tree
Hide file tree
Showing 3,161 changed files with 7 additions and 7 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Empty file modified .gitattributes
100644 → 100755
Empty file.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified CONTRIBUTORS
100644 → 100755
Empty file.
Empty file modified LICENSE
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified VERSION
100644 → 100755
Empty file.
Empty file modified build/.classpath
100644 → 100755
Empty file.
Empty file modified build/.project
100644 → 100755
Empty file.
Empty file modified build/assembly.xml
100644 → 100755
Empty file.
Empty file modified compute/.classpath
100644 → 100755
Empty file.
Empty file modified compute/.project
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified compute/src/main/java/org/zstack/compute/host/AbstractHost.java
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified compute/src/main/java/org/zstack/compute/host/HostManager.java
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified compute/src/main/java/org/zstack/compute/host/HostTracker.java
100644 → 100755
Empty file.
Empty file modified compute/src/main/java/org/zstack/compute/vm/UserVmFactory.java
100644 → 100755
Empty file.
14 changes: 7 additions & 7 deletions compute/src/main/java/org/zstack/compute/vm/VmInstanceBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -2883,13 +2883,6 @@ protected void startVm(final Message msg, final Completion completion) {
return;
}

if (self.getVmNics().isEmpty()) {
throw new OperationFailureException(errf.stringToOperationError(
String.format("unable to start the vm[uuid:%s]. It doesn't have any nic, please attach a nic and try again",
self.getUuid())
));
}

applyPendingCapacityChangeIfNeed();

VmInstanceInventory inv = VmInstanceInventory.valueOf(self);
Expand All @@ -2906,6 +2899,13 @@ protected void startVm(final Message msg, final Completion completion) {
final VmInstanceSpec spec = buildSpecFromInventory(inv, VmOperation.Start);
spec.setMessage(msg);

if (spec.getDestNics().isEmpty()) {
throw new OperationFailureException(errf.stringToOperationError(
String.format("unable to start the vm[uuid:%s]. It doesn't have any nic, please attach a nic and try again",
self.getUuid())
));
}

FlowChain chain = getStartVmWorkFlowChain(inv);
setFlowMarshaller(chain);

Expand Down
Empty file.
Empty file modified compute/src/main/java/org/zstack/compute/zone/AbstractZone.java
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified compute/src/main/java/org/zstack/compute/zone/ZoneManager.java
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified compute/src/main/resources/META-INF/metafile.properties
100644 → 100755
Empty file.
Empty file modified conf/ansible/rsaKeys/id_rsa
100644 → 100755
Empty file.
Empty file modified conf/ansible/rsaKeys/id_rsa.pub
100644 → 100755
Empty file.
Empty file modified conf/apiPortalConfig/InventoryIndexerManager.xml
100644 → 100755
Empty file.
Empty file modified conf/db/V0.6__schema.sql
100644 → 100755
Empty file.
Empty file modified conf/db/V0.6__schema_buildin_httpserver.sql
100644 → 100755
Empty file.
Empty file modified conf/db/upgrade/V0.7__schema.sql
100644 → 100755
Empty file.
Empty file modified conf/db/upgrade/V0.8__schema.sql
100644 → 100755
Empty file.
Empty file modified conf/db/upgrade/V0.9__schema.sql
100644 → 100755
Empty file.
Empty file modified conf/db/upgrade/V1.1__schema.sql
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/applianceVm.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/backupStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/host.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/hostAllocator.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/identity.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/image.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/l2.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/l3.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/license.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/networkService.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/portal.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/primaryStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/securityGroup.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/sftp.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/sys.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/virtualRouter.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/vm.xml
100644 → 100755
Empty file.
Empty file modified conf/errorCodes/volumeSnapshot.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/applianceVm.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/backupStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/ceph.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/cloudbus.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/configuration.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/consoleConfig.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/eip.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/host.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/hostAllocator.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/identity.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/image.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/kvm.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/lb.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/logging.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/managementServer.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/nfsPrimaryStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/portForwarding.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/primaryStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/securityGroupManager.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/snapshot.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/virutalRouter.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/vm.xml
100644 → 100755
Empty file.
Empty file modified conf/globalConfig/volume.xml
100644 → 100755
Empty file.
Empty file modified conf/log4j-cloud.xml
100644 → 100755
Empty file.
Empty file modified conf/log4j2.xml
100644 → 100755
Empty file.
Empty file modified conf/persistence.xml
100644 → 100755
Empty file.
Empty file modified conf/rest-persistence.xml
100644 → 100755
Empty file.
Empty file modified conf/salt/master
100644 → 100755
Empty file.
Empty file modified conf/salt/minion
100644 → 100755
Empty file.
Empty file modified conf/salt/salt-bootstrap.sh
100644 → 100755
Empty file.
Empty file modified conf/scripts/check-public-dns-name.sh
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/applianceVm.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/backupStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/ceph.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/cluster.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/configuration.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/console.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/eip.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/globalConfig.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/host.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/hostAllocator.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/identity.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/image.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/iscsiFileSystemPrimaryStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/kvm.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/l2Network.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/l2VlanNetwork.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/lb.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/localStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/networkService.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/nfsPrimaryStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/portForwarding.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/portal.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/primaryStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/securityGroup.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/sftpBackupStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/simulator.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/simulatorBackupStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/simulatorPrimaryStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/tag.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/vip.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/virtualRouter.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/vmInstance.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/volume.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/volumeSnapshot.xml
100644 → 100755
Empty file.
Empty file modified conf/serviceConfig/zone.xml
100644 → 100755
Empty file.
Empty file modified conf/simulatorBeanRefContext.xml
100644 → 100755
Empty file.
Empty file modified conf/simulatorSpringConfigXml/ApplianceVmSimulator.xml
100644 → 100755
Empty file.
Empty file modified conf/simulatorSpringConfigXml/ConsoleSimulator.xml
100644 → 100755
Empty file.
Empty file modified conf/simulatorSpringConfigXml/KVMSimulator.xml
100644 → 100755
Empty file.
Empty file modified conf/simulatorSpringConfigXml/NfsPrimaryStorageSimulator.xml
100644 → 100755
Empty file.
Empty file modified conf/simulatorSpringConfigXml/SftpBackupStorageSimulator.xml
100644 → 100755
Empty file.
Empty file modified conf/simulatorSpringConfigXml/VirtualRouterSimulator.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/AccountManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ApiMediator.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ApplianceVmFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/Aspect.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/BackupStorageManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/CascadeFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ClusterManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ConfigurationManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ConsoleManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/DatabaseFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/DeletionFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/Error.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/GlobalConfigFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/HostAllocatorManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/HostManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ImageManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/InventoryFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/JobQueueFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/Kvm.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ManagementNodeManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/NetworkManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/NetworkService.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/NfsPrimaryStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/PortForwarding.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/PrimaryStorageManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ProgressBar.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/PuppetFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/QueryFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/RESTFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/SaltFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/SearchManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/SecurityGroupManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/SftpBackupStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/Simulator.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ThreadFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/VirtualRouter.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/VmInstanceManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/VolumeManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ZoneManager.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ansibleFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/ceph.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/eip.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/flatNetworkProvider.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/gc.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/iscsiBtrfsPrimaryStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/jmx.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/keyValueFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/lb.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/localStorage.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/logFacade.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/mediator.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/tag.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/validation.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/vip.xml
100644 → 100755
Empty file.
Empty file modified conf/springConfigXml/volumeSnapshot.xml
100644 → 100755
Empty file.
Empty file modified conf/testLinkTemplates/zone.xml
100644 → 100755
Empty file.
Empty file modified conf/tools/flyway-3.2.1/LICENSE.txt
100644 → 100755
Empty file.
Empty file modified conf/tools/flyway-3.2.1/README.txt
100644 → 100755
Empty file.
Empty file modified conf/tools/flyway-3.2.1/conf/flyway.conf
100644 → 100755
Empty file.
Empty file modified conf/tools/flyway-3.2.1/drivers/jna-3.3.0-platform.jar
100644 → 100755
Empty file.
Empty file modified conf/tools/flyway-3.2.1/drivers/jna-3.3.0.jar
100644 → 100755
Empty file.
Empty file modified conf/tools/flyway-3.2.1/drivers/mariadb-java-client-1.1.7.jar
100644 → 100755
Empty file.
Empty file modified conf/tools/flyway-3.2.1/drivers/put-your-jdbc-drivers-here.txt
100644 → 100755
Empty file.
Empty file modified conf/tools/flyway-3.2.1/flyway.cmd
100644 → 100755
Empty file.
Empty file.
Empty file modified conf/tools/flyway-3.2.1/lib/flyway-commandline-3.2.1.jar
100644 → 100755
Empty file.
Empty file modified conf/tools/flyway-3.2.1/lib/flyway-core-3.2.1.jar
100644 → 100755
Empty file.
Empty file modified conf/tools/pip-7.0.3.tar.gz
100644 → 100755
Empty file.
Empty file modified conf/urlrewrite.xml
100644 → 100755
Empty file.
Empty file modified conf/web.xml
100644 → 100755
Empty file.
Empty file modified conf/zstack-servlet-context.xml
100644 → 100755
Empty file.
Empty file modified conf/zstack.properties
100644 → 100755
Empty file.
Empty file modified conf/zstackSimulator.xml
100644 → 100755
Empty file.
Empty file modified configuration/.classpath
100644 → 100755
Empty file.
Empty file modified configuration/.project
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified configuration/src/main/resources/META-INF/metafile.properties
100644 → 100755
Empty file.
Empty file modified configuration/src/main/resources/testlink.xsd
100644 → 100755
Empty file.
Empty file modified console/.classpath
100644 → 100755
Empty file.
Empty file modified console/.project
100644 → 100755
Empty file.
Empty file modified console/pom.xml
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified console/src/main/java/org/zstack/console/ConsoleManager.java
100644 → 100755
Empty file.
Empty file modified console/src/main/resources/META-INF/metafile.properties
100644 → 100755
Empty file.
Empty file modified core/.classpath
100644 → 100755
Empty file.
Empty file modified core/.project
100644 → 100755
Empty file.
Empty file modified core/src/main/java/org/zstack/core/Composite.java
100644 → 100755
Empty file.
Empty file modified core/src/main/java/org/zstack/core/CompositeVisitor.java
100644 → 100755
Empty file.
Empty file modified core/src/main/java/org/zstack/core/GlobalProperty.java
100644 → 100755
Empty file.
Empty file.
Empty file modified core/src/main/java/org/zstack/core/ansible/AnsibleChecker.java
100644 → 100755
Empty file.
Empty file modified core/src/main/java/org/zstack/core/ansible/AnsibleConstant.java
100644 → 100755
Empty file.
Empty file modified core/src/main/java/org/zstack/core/ansible/AnsibleFacade.java
100644 → 100755
Empty file.
Empty file.
Empty file modified core/src/main/java/org/zstack/core/ansible/RunAnsibleReply.java
100644 → 100755
Empty file.
Empty file.
Empty file modified core/src/main/java/org/zstack/core/aspect/AsyncSafeAspect.aj
100644 → 100755
Empty file.
Empty file.
Empty file modified core/src/main/java/org/zstack/core/aspect/DbDeadlockAspect.aj
100644 → 100755
Empty file.
Empty file modified core/src/main/java/org/zstack/core/aspect/MessageSafeAspect.aj
100644 → 100755
Empty file.
Empty file modified core/src/main/java/org/zstack/core/aspect/ThreadAspect.aj
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified core/src/main/java/org/zstack/core/cascade/CascadeAction.java
100644 → 100755
Empty file.
Empty file modified core/src/main/java/org/zstack/core/cascade/CascadeConstant.java
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified core/src/main/java/org/zstack/core/cascade/CascadeFacade.java
100644 → 100755
Empty file.
Empty file modified core/src/main/java/org/zstack/core/checkpoint/CheckPoint.java
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified core/src/main/java/org/zstack/core/checkpoint/CheckPointVO.java
100644 → 100755
Empty file.
Empty file.
Empty file modified core/src/main/java/org/zstack/core/checkpoint/ChkCleanUp.java
100644 → 100755
Empty file.
Empty file modified core/src/main/java/org/zstack/core/checkpoint/ChkPoint.java
100644 → 100755
Empty file.
Empty file.
Empty file.
Loading

0 comments on commit ada3db8

Please sign in to comment.