[Availability Zone] VM Placement in a Zone

pkg/status/status.go

@@ -20,6 +20,7 @@ func InitStatus() *common.Status {
 		Version:            GenerateVersion(),
 		DownloadStatus:     &common.DownloadStatus{},
 		ValidationStatus:   &common.ValidationStatus{},
+		PlacementStatus:    &common.PlacementStatus{},
 	}
 }
 
@@ -96,6 +97,16 @@ func GetValidationStatus(s *common.Status) []*common.ValidationState {
 	return s.GetValidationStatus().GetValidationState()
 }
 
+func SetPlacementStatus(s *common.Status, placementState *common.PlacementStatus) {
+	s.PlacementStatus = new(common.PlacementStatus)
+	s.PlacementStatus.Status = placementState.GetStatus()
+	s.PlacementStatus.Message = placementState.GetMessage()
+}
+
+func GetPlacementStatus(s *common.Status) common.PlacementStatusType {
+	return s.GetPlacementStatus().GetStatus()
+}
+
 // GetStatuses - converts status to map
 func GetStatuses(status *common.Status) map[string]*string {
 	statuses := map[string]*string{}
@@ -109,6 +120,8 @@ func GetStatuses(status *common.Status) map[string]*string {
 	statuses["Version"] = &version
 	dstate := status.GetDownloadStatus().String()
 	statuses["DownloadStatus"] = &dstate
+	placementStatus := status.GetPlacementStatus().String()
+	statuses["PlacementStatus"] = &placementStatus
 	return statuses
 }
 
@@ -135,6 +148,11 @@ func GetFromStatuses(statuses map[string]*string) (status *common.Status) {
 		proto.UnmarshalText(*val, ps)
 		status.DownloadStatus = ps
 	}
+	if val, ok := statuses["PlacementStatus"]; ok {
+		ps := new(common.PlacementStatus)
+		proto.UnmarshalText(*val, ps)
+		status.PlacementStatus = ps
+	}
 
 	return
 }

rpc/cloudagent/compute/virtualmachine/moc_cloudagent_virtualmachine.proto

@@ -110,6 +110,15 @@ message AvailabilitySetReference {
 	string name = 2;
 }
 
+message ZoneReference {
+	string name = 1;
+}
+
+message ZoneConfiguration {
+	repeated ZoneReference zones = 1;
+	bool strictPlacement = 2;
+}
+
 message VirtualMachine {
 	string name = 1;
 	string id = 2;
@@ -130,6 +139,7 @@ message VirtualMachine {
 	GuestAgentConfiguration guestAgent = 17;
 	VirtualMachineAgentInstanceView guestAgentInstanceView = 18;
 	AvailabilitySetReference availabilitySet = 19;
+	ZoneConfiguration zone = 20;
 }
 
 message VirtualMachineOperationRequest {

rpc/common/moc_common_common.proto

@@ -103,13 +103,25 @@ message Version {
 	string number = 1;
 }
 
+enum PlacementStatusType {
+	UNKNOWN_PLACEMENT = 0;
+	ALIGNED = 1;
+	NOT_ALIGNED = 2;
+}
+
+message PlacementStatus  {
+	PlacementStatusType Status = 1;
+	string Message = 2;
+}
+
 message Status {
 	Health health = 1;
 	ProvisionStatus provisioningStatus = 2;
 	Error lastError = 3;
 	Version version = 4;
 	DownloadStatus downloadStatus = 5;
 	ValidationStatus validationStatus = 6;
+	PlacementStatus	placementStatus = 7;
 }
 
 message Entity {

rpc/nodeagent/compute/virtualmachine/moc_nodeagent_virtualmachine.proto

@@ -108,6 +108,16 @@ message SecurityConfiguration {
 	SecurityType securityType = 3;
 }
 
+message ZoneReference {
+	string name = 1;
+	repeated string nodes = 2;
+}
+
+message ZoneConfiguration {
+	repeated ZoneReference zones = 1;
+	bool strictPlacement = 2;
+}
+
 message VirtualMachine {
 	string name = 1;
 	string id = 2;
@@ -125,6 +135,7 @@ message VirtualMachine {
 	Tags tags = 14;
 	GuestAgentConfiguration guestAgent = 15;
 	VirtualMachineAgentInstanceView guestAgentInstanceView = 16;
+	ZoneConfiguration zone = 17;
 }
 
 message VirtualMachineOperationRequest {