4.8.0

internal/service/cloudapi/extnet/data_source_extnet.go

@@ -204,6 +204,10 @@ func dataSourceExtnetSchemaMake() map[string]*schema.Schema {
 			Computed: true,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
 					"client_type": {
 						Type:     schema.TypeString,
 						Computed: true,

internal/service/cloudapi/extnet/data_source_extnet_reserved_ip.go

@@ -0,0 +1,137 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package extnet
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceExtnetReservedIpRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	reservedList, err := utilityExtnetReservedIpCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenExtnetReservedIp(reservedList))
+
+	return nil
+}
+
+func dataSourceExtnetReservedIpSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"extnet_id": {
+			Type:     schema.TypeInt,
+			Optional: true,
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"extnet_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"reservations": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"account_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"client_type": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"domain_name": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"hostname": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"ip": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"mac": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"type": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"vm_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	return res
+}
+
+func DataSourceExtnetReservedIp() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceExtnetReservedIpRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceExtnetReservedIpSchemaMake(),
+	}
+}

internal/service/cloudapi/extnet/flattens.go

@@ -54,6 +54,7 @@ func flattenExtnetReservations(ers extnet.ListReservations) []map[string]interfa
 	res := make([]map[string]interface{}, 0, len(ers))
 	for _, er := range ers {
 		temp := map[string]interface{}{
+			"account_id":  er.AccountID,
 			"client_type": er.ClientType,
 			"domainname":  er.DomainName,
 			"hostname":    er.Hostname,
@@ -135,3 +136,29 @@ func flattenExtnetList(el *extnet.ListExtNets) []map[string]interface{} {
 	}
 	return res
 }
+
+func flattenExtnetReservedIp(el []extnet.RecordReservedIP) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(el))
+	for _, e := range el {
+		reservations := make([]map[string]interface{}, 0, len(e.Reservations))
+		for _, r := range e.Reservations {
+			temp := map[string]interface{}{
+				"account_id":  r.AccountID,
+				"client_type": r.ClientType,
+				"domain_name": r.DomainName,
+				"hostname":    r.Hostname,
+				"ip":          r.IP,
+				"mac":         r.Mac,
+				"type":        r.Type,
+				"vm_id":       r.VMID,
+			}
+			reservations = append(reservations, temp)
+		}
+		item := map[string]interface{}{
+			"extnet_id":    e.ExtnetID,
+			"reservations": reservations,
+		}
+		res = append(res, item)
+	}
+	return res
+}

internal/service/cloudapi/extnet/utility_extnet_reserved_ip.go

@@ -0,0 +1,61 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package extnet
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func utilityExtnetReservedIpCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) ([]extnet.RecordReservedIP, error) {
+	c := m.(*controller.ControllerCfg)
+	req := extnet.GetReservedIP{
+		AccountID: uint64(d.Get("account_id").(int)),
+	}
+
+	if extNetID, ok := d.GetOk("extnet_id"); ok {
+		req.ExtNetID = uint64(extNetID.(int))
+	}
+
+	log.Debugf("utilityExtnetReservedIpCheckPresence")
+	res, err := c.CloudAPI().ExtNet().GetReservedIP(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}

internal/service/cloudapi/kvmvm/data_source_compute.go

@@ -703,6 +703,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"auto_start_w_node": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"chipset": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -950,6 +954,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vgpus": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudapi/kvmvm/data_source_compute_list.go

@@ -121,6 +121,10 @@ func itemComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"auto_start_w_node": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"boot_order": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudapi/kvmvm/flattens.go

@@ -183,6 +183,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"affinity_weight":     compute.AffinityWeight,
 			"anti_affinity_rules": flattenListRules(compute.AntiAffinityRules),
 			"arch":                compute.Architecture,
+			"auto_start_w_node":   compute.AutoStart,
 			"boot_order":          compute.BootOrder,
 			"bootdisk_size":       compute.BootDiskSize,
 			"chipset":             compute.Chipset,
@@ -362,6 +363,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("account_name", computeRec.AccountName)
 	d.Set("affinity_weight", computeRec.AffinityWeight)
 	d.Set("arch", computeRec.Architecture)
+	d.Set("auto_start_w_node", computeRec.AutoStart)
 	d.Set("boot_order", computeRec.BootOrder)
 	// we intentionally use the SizeMax field, do not change it until the BootDiskSize field is fixed on the platform
 	d.Set("boot_disk_size", bootDisk.SizeMax)
@@ -429,6 +431,7 @@ func flattenCompute(d *schema.ResourceData, computeRec compute.RecordCompute, pc
 	d.Set("updated_by", computeRec.UpdatedBy)
 	d.Set("updated_time", computeRec.UpdatedTime)
 	d.Set("user_managed", computeRec.UserManaged)
+	d.Set("vnc_password", computeRec.VNCPassword)
 	d.Set("vgpus", computeRec.VGPUs)
 	d.Set("virtual_image_id", computeRec.VirtualImageID)
 	d.Set("virtual_image_name", computeRec.VirtualImageName)
@@ -613,6 +616,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("affinity_rules", flattenAffinityRules(computeRec.AffinityRules))
 	d.Set("affinity_weight", computeRec.AffinityWeight)
 	d.Set("anti_affinity_rules", flattenListRules(computeRec.AntiAffinityRules))
+	d.Set("auto_start_w_node", computeRec.AutoStart)
 	d.Set("arch", computeRec.Architecture)
 	d.Set("chipset", computeRec.Chipset)
 	d.Set("boot_order", computeRec.BootOrder)
@@ -672,6 +676,7 @@ func flattenDataCompute(d *schema.ResourceData, computeRec compute.RecordCompute
 	d.Set("updated_time", computeRec.UpdatedTime)
 	d.Set("user_managed", computeRec.UserManaged)
 	d.Set("userdata", string(userdata))
+	d.Set("vnc_password", computeRec.VNCPassword)
 	d.Set("vgpus", computeRec.VGPUs)
 	d.Set("virtual_image_id", computeRec.VirtualImageID)
 	d.Set("virtual_image_name", computeRec.VirtualImageName)

internal/service/cloudapi/kvmvm/resource_compute.go

@@ -491,12 +491,26 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 			req := compute.PinToStackRequest{
 				ComputeID: computeId,
 			}
+			req.AutoStart = d.Get("auto_start_w_node").(bool)
 			_, err := c.CloudAPI().Compute().PinToStack(ctx, req)
 			if err != nil {
 				warnings.Add(err)
 			}
 		}
 
+		if !d.Get("pin_to_stack").(bool) && d.Get("auto_start_w_node").(bool) {
+			req := compute.UpdateRequest{
+				ComputeID: computeId,
+				AutoStart: d.Get("auto_start_w_node").(bool),
+				CPUPin:    d.Get("cpu_pin").(bool),
+				HPBacked:  d.Get("hp_backed").(bool),
+			}
+			_, err := c.CloudAPI().Compute().Update(ctx, req)
+			if err != nil {
+				warnings.Add(err)
+			}
+		}
+
 		if d.Get("pause").(bool) {
 			req := compute.PauseRequest{
 				ComputeID: computeId,
@@ -619,7 +633,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	if !hasRG {
-		return diag.Errorf("resourceComputeUpdate: can't update Compute bacause rgID %d not allowed or does not exist", d.Get("rg_id").(int))
+		return diag.Errorf("resourceComputeUpdate: can't update Compute because rgID %d not allowed or does not exist", d.Get("rg_id").(int))
 	}
 
 	hasImage, err := existImageId(ctx, d, m)
@@ -628,7 +642,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	if !hasImage {
-		return diag.Errorf("resourceComputeUpdate: can't update Compute bacause imageID %d not allowed or does not exist", d.Get("image_id").(int))
+		return diag.Errorf("resourceComputeUpdate: can't update Compute because imageID %d not allowed or does not exist", d.Get("image_id").(int))
 	}
 
 	if disks, ok := d.GetOk("disks"); ok {
@@ -862,7 +876,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed") {
+	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed", "chipset", "auto_start_w_node") {
 		req := compute.UpdateRequest{
 			ComputeID: computeRec.ID,
 		}
@@ -876,21 +890,17 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		if d.HasChange("numa_affinity") {
 			req.NumaAffinity = d.Get("numa_affinity").(string)
 		}
-		if d.HasChange("cpu_pin") {
-			req.CPUPin = d.Get("cpu_pin").(bool)
-		}
-		if d.HasChange("hp_backed") {
-			req.HPBacked = d.Get("hp_backed").(bool)
-		}
-
 		if d.HasChange("chipset") {
 			req.Chipset = d.Get("chipset").(string)
 		}
+		req.CPUPin = d.Get("cpu_pin").(bool)
+		req.HPBacked = d.Get("hp_backed").(bool)
+		req.AutoStart = d.Get("auto_start_w_node").(bool)
 
 		// Note bene: numa_affinity, cpu_pin and hp_backed are not allowed to be changed for compute in STARTED tech status.
 		// If STARTED, we need to stop it before update
 		var isStopRequired bool
-		if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed") && d.Get("started").(bool) {
+		if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed", "chipset") && d.Get("started").(bool) {
 			isStopRequired = true
 		}
 		if isStopRequired {
@@ -1481,7 +1491,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 			req := compute.PinToStackRequest{
 				ComputeID: computeRec.ID,
 			}
-
+			req.AutoStart = d.Get("auto_start_w_node").(bool)
 			_, err := c.CloudAPI().Compute().PinToStack(ctx, req)
 			if err != nil {
 				return diag.FromErr(err)
@@ -2123,6 +2133,12 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Optional: true,
 			Default:  false,
 		},
+		"auto_start_w_node": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Computed:    true,
+			Description: "Flag for start compute after node exits from MAINTENANCE state",
+		},
 		"auto_start": {
 			Type:        schema.TypeBool,
 			Optional:    true,
@@ -2411,6 +2427,10 @@ func ResourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vgpus": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -2444,11 +2464,14 @@ func ResourceCompute() *schema.Resource {
 		},
 
 		CustomizeDiff: func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error {
-			if diff.HasChanges() || diff.HasChanges("network", "affinity_rules", "anti_affinity_rules",
+			if diff.HasChanges() || diff.HasChanges("chipset", "pin_to_stack", "auto_start_w_node", "network", "affinity_rules", "anti_affinity_rules",
 				"disks", "extra_disks", "tags", "port_forwarding", "user_access", "snapshot", "pci_devices") {
 				diff.SetNewComputed("updated_time")
 				diff.SetNewComputed("updated_by")
 			}
+			if diff.HasChanges("pin_to_stack") {
+				diff.SetNewComputed("pinned")
+			}
 			return nil
 		},
 

internal/service/cloudapi/vins/data_source_vins.go

@@ -347,6 +347,10 @@ func vnfDevSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vins": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -372,20 +376,8 @@ func vinsComputeSchemaMake() map[string]*schema.Schema {
 
 func reservationSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
-		"client_type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"desc": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"domainname": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"hostname": {
-			Type:     schema.TypeString,
+		"account_id": {
+			Type:     schema.TypeInt,
 			Computed: true,
 		},
 		"ip": {

internal/service/cloudapi/vins/flattens.go

@@ -151,6 +151,7 @@ func flattenVNFDev(vnfDev vins.RecordVNFDev) []map[string]interface{} {
 		"status":         vnfDev.Status,
 		"tech_status":    vnfDev.TechStatus,
 		"type":           vnfDev.Type,
+		"vnc_password":   vnfDev.VNCPassword,
 		"vins":           vnfDev.VINS,
 	}
 
@@ -176,14 +177,11 @@ func flattenReservations(reservations vins.ListReservations) []map[string]interf
 	res := make([]map[string]interface{}, 0, len(reservations))
 	for _, reservation := range reservations {
 		temp := map[string]interface{}{
-			"client_type": reservation.ClientType,
-			"desc":        reservation.Description,
-			"domainname":  reservation.DomainName,
-			"hostname":    reservation.Hostname,
-			"ip":          reservation.IP,
-			"mac":         reservation.MAC,
-			"type":        reservation.Type,
-			"vm_id":       reservation.VMID,
+			"account_id": reservation.AccountID,
+			"ip":         reservation.IP,
+			"mac":        reservation.MAC,
+			"type":       reservation.Type,
+			"vm_id":      reservation.VMID,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudapi/vins/resource_static_route.go

@@ -1,277 +1,194 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Authors:
-Petr Krutov, <petr.krutov@digitalenergy.online>
-Stanislav Solovev, <spsolovev@digitalenergy.online>
-Kasim Baybikov, <kmbaybikov@basistech.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
-Orchestration Technology) with Terraform by Hashicorp.
-
-Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
-
-Please see README.md to learn where to place source code so that it
-builds seamlessly.
-
-Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
-*/
-
-package vins
-
-import (
-	"context"
-	"fmt"
-	"strconv"
-	"strings"
-
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	c := m.(*controller.ControllerCfg)
-
-	if _, ok := d.GetOk("vins_id"); ok {
-		haveVinsID, err := existVinsID(ctx, d, m)
-		if err != nil {
-			return diag.FromErr(err)
-		}
-
-		if !haveVinsID {
-			return diag.Errorf("resourceStaticRouteCreate: can't create Static Route because Vins ID %d is not allowed or does not exist", d.Get("vins_id").(int))
-		}
-	}
-
-	req := vins.StaticRouteAddRequest{
-		VINSID:      uint64(d.Get("vins_id").(int)),
-		Destination: d.Get("destination").(string),
-		Netmask:     d.Get("netmask").(string),
-		Gateway:     d.Get("gateway").(string),
-	}
-
-	if computesIDS, ok := d.GetOk("compute_ids"); ok {
-		ids := computesIDS.([]interface{})
-
-		res := make([]uint64, 10)
-
-		for _, id := range ids {
-			computeId := uint64(id.(int))
-			res = append(res, computeId)
-		}
-
-		req.ComputeIds = res
-	}
-
-	_, err := c.CloudAPI().VINS().StaticRouteAdd(ctx, req)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	staticRouteData, err := getStaticRouteData(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	d.SetId(fmt.Sprintf("%d#%d", req.VINSID, staticRouteData.ID))
-
-	return resourceStaticRouteRead(ctx, d, m)
-}
-
-func resourceStaticRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	warnings := dc.Warnings{}
-
-	staticRouteData, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	flattenStaticRouteData(d, staticRouteData)
-
-	return warnings.Get()
-}
-
-func resourceStaticRouteUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	c := m.(*controller.ControllerCfg)
-	warnings := dc.Warnings{}
-
-	if _, ok := d.GetOk("vins_id"); ok {
-		haveVinsID, err := existVinsID(ctx, d, m)
-		if err != nil {
-			return diag.FromErr(err)
-		}
-
-		if !haveVinsID {
-			return diag.Errorf("resourceVinsUpdate: can't update Static Route because VinsID %d is not allowed or does not exist", d.Get("vins_id").(int))
-		}
-	}
-
-	staticRouteData, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	if d.HasChange("compute_ids") {
-		deletedIds := make([]uint64, 0)
-		addedIds := make([]uint64, 0)
-
-		oldComputeIds, newComputeIds := d.GetChange("compute_ids")
-		oldComputeIdsSlice := oldComputeIds.([]interface{})
-		newComputeIdsSlice := newComputeIds.([]interface{})
-
-		for _, el := range oldComputeIdsSlice {
-			if !isContainsIds(newComputeIdsSlice, el) {
-				convertedEl := uint64(el.(int))
-				deletedIds = append(deletedIds, convertedEl)
-			}
-		}
-
-		for _, el := range newComputeIdsSlice {
-			if !isContainsIds(oldComputeIdsSlice, el) {
-				convertedEl := uint64(el.(int))
-				addedIds = append(addedIds, convertedEl)
-			}
-		}
-
-		if len(deletedIds) > 0 {
-			req := vins.StaticRouteAccessRevokeRequest{
-				VINSID:     uint64(d.Get("vins_id").(int)),
-				RouteId:    staticRouteData.ID,
-				ComputeIds: deletedIds,
-			}
-
-			_, err := c.CloudAPI().VINS().StaticRouteAccessRevoke(ctx, req)
-			if err != nil {
-				warnings.Add(err)
-			}
-		}
-
-		if len(addedIds) > 0 {
-			req := vins.StaticRouteAccessGrantRequest{
-				VINSID:     uint64(d.Get("vins_id").(int)),
-				RouteId:    staticRouteData.ID,
-				ComputeIds: addedIds,
-			}
-
-			_, err := c.CloudAPI().VINS().StaticRouteAccessGrant(ctx, req)
-			if err != nil {
-				warnings.Add(err)
-			}
-		}
-	}
-
-	return append(warnings.Get(), resourceStaticRouteRead(ctx, d, m)...)
-}
-
-func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	c := m.(*controller.ControllerCfg)
-	arr := strings.Split(d.Id(), "#")
-	if len(arr) != 2 {
-		return diag.FromErr(fmt.Errorf("broken state id"))
-	}
-
-	vinsId, _ := strconv.ParseUint(arr[0], 10, 64)
-	routeId, _ := strconv.ParseUint(arr[1], 10, 64)
-
-	req := vins.StaticRouteDelRequest{
-		VINSID:  vinsId,
-		RouteId: routeId,
-	}
-
-	_, err := c.CloudAPI().VINS().StaticRouteDel(ctx, req)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId("")
-
-	return nil
-}
-
-func resourceStaticRouteSchemaMake() map[string]*schema.Schema {
-	rets := dataSourceStaticRouteSchemaMake()
-	rets["route_id"] = &schema.Schema{
-		Type:     schema.TypeInt,
-		Computed: true,
-		Optional: true,
-	}
-	rets["compute_ids"] = &schema.Schema{
-		Type:     schema.TypeList,
-		Optional: true,
-		Computed: true,
-		Elem: &schema.Schema{
-			Type: schema.TypeInt,
-		},
-	}
-	rets["destination"] = &schema.Schema{
-		Type:     schema.TypeString,
-		Required: true,
-	}
-
-	rets["gateway"] = &schema.Schema{
-		Type:     schema.TypeString,
-		Required: true,
-	}
-	rets["netmask"] = &schema.Schema{
-		Type:     schema.TypeString,
-		Required: true,
-	}
-
-	return rets
-}
-
-func isContainsIds(els []interface{}, el interface{}) bool {
-	convEl := el.(int)
-	for _, elOld := range els {
-		if convEl == elOld.(int) {
-			return true
-		}
-	}
-	return false
-}
-
-func ResourceStaticRoute() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		CreateContext: resourceStaticRouteCreate,
-		ReadContext:   resourceStaticRouteRead,
-		UpdateContext: resourceStaticRouteUpdate,
-		DeleteContext: resourceStaticRouteDelete,
-
-		Importer: &schema.ResourceImporter{
-			StateContext: schema.ImportStatePassthroughContext,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &constants.Timeout20m,
-			Read:    &constants.Timeout600s,
-			Update:  &constants.Timeout20m,
-			Delete:  &constants.Timeout600s,
-			Default: &constants.Timeout600s,
-		},
-
-		Schema: resourceStaticRouteSchemaMake(),
-	}
-}
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package vins
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	c := m.(*controller.ControllerCfg)
+
+	if _, ok := d.GetOk("vins_id"); ok {
+		haveVinsID, err := existVinsID(ctx, d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		if !haveVinsID {
+			return diag.Errorf("resourceStaticRouteCreate: can't create Static Route because Vins ID %d is not allowed or does not exist", d.Get("vins_id").(int))
+		}
+	}
+
+	req := vins.StaticRouteAddRequest{
+		VINSID:      uint64(d.Get("vins_id").(int)),
+		Destination: d.Get("destination").(string),
+		Netmask:     d.Get("netmask").(string),
+		Gateway:     d.Get("gateway").(string),
+	}
+
+	_, err := c.CloudAPI().VINS().StaticRouteAdd(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	staticRouteData, err := getStaticRouteData(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(fmt.Sprintf("%d#%d", req.VINSID, staticRouteData.ID))
+
+	return resourceStaticRouteRead(ctx, d, m)
+}
+
+func resourceStaticRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	warnings := dc.Warnings{}
+
+	staticRouteData, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	flattenStaticRouteData(d, staticRouteData)
+
+	return warnings.Get()
+}
+
+func resourceStaticRouteUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	return nil
+}
+
+func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	c := m.(*controller.ControllerCfg)
+	arr := strings.Split(d.Id(), "#")
+	if len(arr) != 2 {
+		return diag.FromErr(fmt.Errorf("broken state id"))
+	}
+
+	vinsId, _ := strconv.ParseUint(arr[0], 10, 64)
+	routeId, _ := strconv.ParseUint(arr[1], 10, 64)
+
+	req := vins.StaticRouteDelRequest{
+		VINSID:  vinsId,
+		RouteId: routeId,
+	}
+
+	_, err := c.CloudAPI().VINS().StaticRouteDel(ctx, req)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId("")
+
+	return nil
+}
+
+func resourceStaticRouteSchemaMake() map[string]*schema.Schema {
+	rets := dataSourceStaticRouteSchemaMake()
+	rets["route_id"] = &schema.Schema{
+		Type:     schema.TypeInt,
+		Computed: true,
+		Optional: true,
+	}
+	rets["compute_ids"] = &schema.Schema{
+		Type:     schema.TypeList,
+		Computed: true,
+		Elem: &schema.Schema{
+			Type: schema.TypeInt,
+		},
+	}
+	rets["destination"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+
+	rets["gateway"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	rets["netmask"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+
+	return rets
+}
+
+func isContainsIds(els []interface{}, el interface{}) bool {
+	convEl := el.(int)
+	for _, elOld := range els {
+		if convEl == elOld.(int) {
+			return true
+		}
+	}
+	return false
+}
+
+func ResourceStaticRoute() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		CreateContext: resourceStaticRouteCreate,
+		ReadContext:   resourceStaticRouteRead,
+		UpdateContext: resourceStaticRouteUpdate,
+		DeleteContext: resourceStaticRouteDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create:  &constants.Timeout20m,
+			Read:    &constants.Timeout600s,
+			Update:  &constants.Timeout20m,
+			Delete:  &constants.Timeout600s,
+			Default: &constants.Timeout600s,
+		},
+
+		Schema: resourceStaticRouteSchemaMake(),
+	}
+}

internal/service/cloudbroker/extnet/data_source_extnet_reserved_ip.go

@@ -0,0 +1,71 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+Tim Tkachev, <tvtkachev@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package extnet
+
+import (
+	"context"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
+)
+
+func dataSourceExtnetReservedIpRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	reservedList, err := utilityExtnetReservedIpCheckPresence(ctx, d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenExtnetReservedIp(reservedList))
+
+	return nil
+}
+
+func DataSourceExtnetReservedIp() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceExtnetReservedIpRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceExtnetReservedIpSchemaMake(),
+	}
+}

internal/service/cloudbroker/extnet/flattens.go

@@ -133,7 +133,6 @@ func flattenRecordExtnetResource(d *schema.ResourceData, recNet *extnet.RecordEx
 	d.Set("routes", flattenStaticRouteList(staticRouteList))
 }
 
-
 func flattenExtnetExcluded(ers extnet.ListReservations) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0)
 	for _, er := range ers {
@@ -157,6 +156,7 @@ func flattenExtnetReservations(ers extnet.ListReservations) []map[string]interfa
 	res := make([]map[string]interface{}, 0)
 	for _, er := range ers {
 		temp := map[string]interface{}{
+			"account_id":  er.AccountID,
 			"client_type": er.ClientType,
 			"domain_name": er.DomainName,
 			"hostname":    er.Hostname,
@@ -217,4 +217,30 @@ func flattenStaticRouteData(d *schema.ResourceData, route *extnet.ItemRoutes) {
 	d.Set("netmask", route.Netmask)
 	d.Set("compute_ids", route.ComputeIds)
 	d.Set("route_id", route.ID)
-}
+}
+
+func flattenExtnetReservedIp(el []extnet.RecordReservedIP) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(el))
+	for _, e := range el {
+		reservations := make([]map[string]interface{}, 0, len(e.Reservations))
+		for _, r := range e.Reservations {
+			temp := map[string]interface{}{
+				"account_id":  r.AccountID,
+				"client_type": r.ClientType,
+				"domain_name": r.DomainName,
+				"hostname":    r.Hostname,
+				"ip":          r.IP,
+				"mac":         r.Mac,
+				"type":        r.Type,
+				"vm_id":       r.VMID,
+			}
+			reservations = append(reservations, temp)
+		}
+		item := map[string]interface{}{
+			"extnet_id":    e.ExtnetID,
+			"reservations": reservations,
+		}
+		res = append(res, item)
+	}
+	return res
+}

internal/service/cloudbroker/extnet/resource_extnet.go

@@ -54,6 +54,9 @@ func resourceExtnetCreate(ctx context.Context, d *schema.ResourceData, m interfa
 	if err := ic.ExistGID(ctx, uint64(d.Get("gid").(int)), c); err != nil {
 		return diag.FromErr(err)
 	}
+	if err := checkReserveIp(ctx, d, c); err != nil {
+		return diag.FromErr(err)
+	}
 
 	req := extnet.CreateRequest{
 		Name:   d.Get("name").(string),
@@ -191,6 +194,34 @@ func resourceExtnetCreate(ctx context.Context, d *schema.ResourceData, m interfa
 		}
 	}
 
+	// for reserve IP extnet must be enabled
+	if d.Get("reserved_ip").(*schema.Set).Len() > 0 {
+		for _, reservedIP := range d.Get("reserved_ip").(*schema.Set).List() {
+			reservedIPMap := reservedIP.(map[string]interface{})
+			req := extnet.AddReserveIPRequest{
+				AccountID: uint64(reservedIPMap["account_id"].(int)),
+				ExtNetID:  netID,
+			}
+			if ipCount, ok := reservedIPMap["ip_count"]; ok {
+				req.IPCount = uint64(ipCount.(int))
+			}
+			if reservedIPMap["ips"].(*schema.Set).Len() > 0 {
+				ips := reservedIPMap["ips"].(*schema.Set).List()
+				for i, ip := range ips {
+					if i >= int(req.IPCount) {
+						break
+					}
+					req.IPs = append(req.IPs, ip.(string))
+				}
+			}
+
+			_, err := c.CloudBroker().ExtNet().AddReserveIP(ctx, req)
+			if err != nil {
+				w.Add(err)
+			}
+		}
+	}
+
 	return resourceExtnetRead(ctx, d, m)
 }
 
@@ -215,6 +246,10 @@ func resourceExtnetUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 	log.Debugf("cloudbroker: resourceExtnetUpdate called with id %s", d.Id())
 	c := m.(*controller.ControllerCfg)
 
+	if err := checkReserveIp(ctx, d, c); err != nil {
+		return diag.FromErr(err)
+	}
+
 	recNet, err := utilityExtnetCheckPresence(ctx, d, m)
 	if err != nil {
 		d.SetId("")
@@ -267,6 +302,12 @@ func resourceExtnetUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 		}
 	}
 
+	if d.HasChange("reserved_ip") {
+		if err := reservedIPsUpdate(ctx, d, c, recNet); err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	if d.HasChange("shared_with") {
 		if err := handleSharedWithUpdate(ctx, d, c); err != nil {
 			return diag.FromErr(err)
@@ -330,6 +371,8 @@ func ResourceExtnetCB() *schema.Resource {
 			Default: &constants.Timeout300s,
 		},
 
+		CustomizeDiff: validateReserveIPs,
+
 		Schema: resourceExtnetSchemaMake(),
 	}
 }

internal/service/cloudbroker/extnet/schema.go

@@ -1,6 +1,9 @@
 package extnet
 
-import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
 
 func dataSourceExtnetDefaultSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
@@ -474,6 +477,10 @@ func dataSourceExtnetSchemaMake() map[string]*schema.Schema {
 			Computed: true,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
 					"client_type": {
 						Type:     schema.TypeString,
 						Computed: true,
@@ -728,6 +735,30 @@ func resourceExtnetSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeInt,
 			},
 		},
+		"reserved_ip": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Required: true,
+					},
+					"ip_count": {
+						Type:         schema.TypeInt,
+						Optional:     true,
+						ValidateFunc: validation.IntBetween(1, 255),
+					},
+					"ips": {
+						Type:     schema.TypeSet,
+						Optional: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+				},
+			},
+		},
 		"ckey": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -868,6 +899,10 @@ func resourceExtnetSchemaMake() map[string]*schema.Schema {
 			Computed: true,
 			Elem: &schema.Resource{
 				Schema: map[string]*schema.Schema{
+					"account_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
 					"client_type": {
 						Type:     schema.TypeString,
 						Computed: true,
@@ -905,3 +940,69 @@ func resourceExtnetSchemaMake() map[string]*schema.Schema {
 		},
 	}
 }
+
+func dataSourceExtnetReservedIpSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"account_id": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"extnet_id": {
+			Type:     schema.TypeInt,
+			Optional: true,
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"extnet_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"reservations": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"account_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+								"client_type": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"domain_name": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"hostname": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"ip": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"mac": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"type": {
+									Type:     schema.TypeString,
+									Computed: true,
+								},
+								"vm_id": {
+									Type:     schema.TypeInt,
+									Computed: true,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	return res
+}

internal/service/cloudbroker/extnet/utility_extnet_reserved_ip.go

@@ -0,0 +1,61 @@
+/*
+Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Authors:
+Petr Krutov, <petr.krutov@digitalenergy.online>
+Stanislav Solovev, <spsolovev@digitalenergy.online>
+Kasim Baybikov, <kmbaybikov@basistech.ru>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
+Terraform DECORT provider - manage resources provided by DECORT (Digital Energy Cloud
+Orchestration Technology) with Terraform by Hashicorp.
+
+Source code: https://repository.basistech.ru/BASIS/terraform-provider-decort
+
+Please see README.md to learn where to place source code so that it
+builds seamlessly.
+
+Documentation: https://repository.basistech.ru/BASIS/terraform-provider-decort/wiki
+*/
+
+package extnet
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/extnet"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+)
+
+func utilityExtnetReservedIpCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) ([]extnet.RecordReservedIP, error) {
+	c := m.(*controller.ControllerCfg)
+	req := extnet.GetReservedIP{
+		AccountID: uint64(d.Get("account_id").(int)),
+	}
+
+	if extNetID, ok := d.GetOk("extnet_id"); ok {
+		req.ExtNetID = uint64(extNetID.(int))
+	}
+
+	log.Debugf("utilityExtnetReservedIpCheckPresence")
+	res, err := c.CloudBroker().ExtNet().GetReservedIP(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}

internal/service/cloudbroker/extnet/utility_extnet_resource.go

@@ -35,6 +35,8 @@ package extnet
 
 import (
 	"context"
+	"errors"
+	"fmt"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	log "github.com/sirupsen/logrus"
@@ -341,3 +343,255 @@ func handleMigrateUpdate(ctx context.Context, d *schema.ResourceData, c *control
 	return nil
 }
 
+func checkReserveIp(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg) error {
+	var err error
+	if d.Get("reserved_ip").(*schema.Set).Len() > 0 {
+		reservedIPList := d.Get("reserved_ip").(*schema.Set).List()
+		accountMap := make(map[int]struct{}, len(reservedIPList))
+		for _, reservedIP := range reservedIPList {
+			reservedIPMap := reservedIP.(map[string]interface{})
+			accountId := reservedIPMap["account_id"].(int)
+			if _, ok := accountMap[accountId]; ok {
+				err = errors.Join(err, fmt.Errorf("checkReserveIp: you must have only one block with id %d", accountId))
+			}
+			accountMap[accountId] = struct{}{}
+			_, okCount := reservedIPMap["ip_count"]
+			if !okCount && reservedIPMap["ips"].(*schema.Set).Len() == 0 {
+				err = errors.Join(err, fmt.Errorf("checkReserveIp: either ip_count or set of ips must be specified"))
+			}
+			existErr := ic.ExistAccount(ctx, uint64(accountId), c)
+			if existErr != nil {
+				err = errors.Join(err, existErr)
+			}
+		}
+	}
+
+	return err
+}
+
+func reservedIPsUpdate(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg, recNet *extnet.RecordExtNet) error {
+
+	addSet, delSet, err := differenceIPReserved(ctx, d, c)
+	if err != nil {
+		return err
+	}
+
+	if len(delSet) > 0 {
+		for _, del := range delSet {
+			delMap := del.(map[string]interface{})
+
+			log.Debugf("reservedIPsUpdate: removing reserved IPs for account %d", delMap["account_id"].(int))
+
+			req := extnet.DelReserveIPRequest{
+				AccountID: uint64(delMap["account_id"].(int)),
+				ExtNetID:  recNet.ID,
+			}
+			if ipCount, ok := delMap["ip_count"]; ok {
+				req.IPCount = uint64(ipCount.(int))
+			}
+			if delIPs, ok := delMap["ips"]; ok {
+				ips := delIPs.(*schema.Set).List()
+				for _, ip := range ips {
+					req.IPs = append(req.IPs, ip.(string))
+				}
+			}
+
+			_, err := c.CloudBroker().ExtNet().DelReserveIP(ctx, req)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(addSet) > 0 {
+		for _, add := range addSet {
+			addMap := add.(map[string]interface{})
+
+			log.Debugf("reservedIPsUpdate: add reserved IPs for account %d", addMap["account_id"].(int))
+
+			req := extnet.AddReserveIPRequest{
+				AccountID: uint64(addMap["account_id"].(int)),
+				ExtNetID:  recNet.ID,
+			}
+			if ipCount, ok := addMap["ip_count"]; ok {
+				req.IPCount = uint64(ipCount.(int))
+			}
+			if addIPs, ok := addMap["ips"]; ok {
+				ips := addIPs.(*schema.Set).List()
+				for _, ip := range ips {
+					req.IPs = append(req.IPs, ip.(string))
+				}
+			}
+
+			_, err := c.CloudBroker().ExtNet().AddReserveIP(ctx, req)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func differenceIPReserved(ctx context.Context, d *schema.ResourceData, c *controller.ControllerCfg) (addList, delList []interface{}, errs error) {
+	addList = make([]interface{}, 0)
+	delList = make([]interface{}, 0)
+	oldSet, newSet := d.GetChange("reserved_ip")
+	oldList := oldSet.(*schema.Set).List()
+	newList := newSet.(*schema.Set).List()
+	for _, oldReservedIP := range oldList {
+		oldMap := oldReservedIP.(map[string]interface{})
+		found := false
+		for _, newReservedIP := range newList {
+			newMap := newReservedIP.(map[string]interface{})
+			if newMap["account_id"] == oldMap["account_id"] && newMap["ip_count"] == oldMap["ip_count"] && newMap["ips"] == oldMap["ips"] {
+				found = true
+				break
+			}
+			if newMap["account_id"] == oldMap["account_id"] {
+				add := make(map[string]interface{}, 0)
+				del := make(map[string]interface{}, 0)
+				delSet := oldMap["ips"].(*schema.Set).Difference(newMap["ips"].(*schema.Set))
+				addSet := newMap["ips"].(*schema.Set).Difference(oldMap["ips"].(*schema.Set))
+				if delSet.Len() > 0 {
+					del["account_id"] = oldMap["account_id"].(int)
+					del["ips"] = delSet
+					if oldMap["ip_count"].(int)-newMap["ip_count"].(int) >= delSet.Len() {
+						del["ip_count"] = oldMap["ip_count"].(int) - newMap["ip_count"].(int)
+					} else {
+						del["ip_count"] = delSet.Len()
+						newMap["ip_count"] = newMap["ip_count"].(int) + delSet.Len()
+					}
+				} else if newMap["ip_count"].(int) < oldMap["ip_count"].(int) {
+					del["account_id"] = oldMap["account_id"].(int)
+					del["ip_count"] = oldMap["ip_count"].(int) - newMap["ip_count"].(int)
+				}
+				if addSet.Len() > 0 {
+					add["account_id"] = oldMap["account_id"].(int)
+					add["ips"] = addSet
+					add["ip_count"] = newMap["ip_count"].(int) - oldMap["ip_count"].(int)
+					if add["ip_count"].(int) < 0 {
+						add["ip_count"] = 0
+					}
+					if add["ip_count"].(int)-addSet.Len() < 0 {
+						del["account_id"] = oldMap["account_id"].(int)
+						if _, ok := del["ip_count"]; ok {
+							del["ip_count"] = del["ip_count"].(int) + addSet.Len()
+						} else {
+							del["ip_count"] = addSet.Len()
+						}
+					}
+				} else if newMap["ip_count"].(int)-oldMap["ip_count"].(int) > 0 {
+					add["account_id"] = oldMap["account_id"].(int)
+					add["ip_count"] = newMap["ip_count"].(int) - oldMap["ip_count"].(int)
+				}
+				if _, ok := add["account_id"]; ok {
+					addList = append(addList, add)
+				}
+				if _, ok := del["account_id"]; ok {
+					ipsLen := 0
+					if _, ok := del["ips"]; ok {
+						ipsLen = del["ips"].(*schema.Set).Len()
+					}
+					freeCount := del["ip_count"].(int) - ipsLen
+					if freeCount > 0 {
+						req := extnet.GetReservedIP{
+							AccountID: uint64(del["account_id"].(int)),
+							ExtNetID:  uint64(d.Get("extnet_id").(int)),
+						}
+						resIpsList, err := c.CloudBroker().ExtNet().GetReservedIP(ctx, req)
+						if err != nil {
+							errs = errors.Join(errs, err)
+						}
+						freeIPs := getFreeIps(resIpsList[0].Reservations, newMap["ips"], del["ips"])
+						if _, ok := del["ips"]; !ok {
+							del["ips"] = schema.NewSet(schema.HashString, []interface{}{})
+						}
+						for i := 0; i < freeCount; i++ {
+							del["ips"].(*schema.Set).Add(freeIPs[i])
+						}
+					}
+					delList = append(delList, del)
+				}
+				found = true
+				break
+			}
+		}
+		if found {
+			continue
+		}
+		delList = append(delList, oldReservedIP)
+	}
+
+	for _, newReservedIP := range newList {
+		newMap := newReservedIP.(map[string]interface{})
+		found := false
+		for _, oldReservedIP := range oldList {
+			oldMap := oldReservedIP.(map[string]interface{})
+			if newMap["account_id"] == oldMap["account_id"] {
+				found = true
+				break
+			}
+		}
+		if found {
+			continue
+		}
+		addList = append(addList, newReservedIP)
+	}
+
+	if errs != nil {
+		d.Set("reserved_ip", oldSet)
+	}
+
+	return
+}
+
+// getFreeIps returns array IPs which can be deleted
+func getFreeIps(reserved []extnet.Reservations, newIps, delIps interface{}) []string {
+	newIpsList := make([]interface{}, 0)
+	delIpsList := make([]interface{}, 0)
+	if newIps != nil {
+		newIpsList = newIps.(*schema.Set).List()
+	}
+	if delIps != nil {
+		delIpsList = delIps.(*schema.Set).List()
+	}
+	newIpsMap := make(map[string]struct{}, len(newIpsList))
+	delIpsMap := make(map[string]struct{}, len(delIpsList))
+	freeIPs := make([]string, 0)
+	for _, ip := range newIpsList {
+		newIpsMap[ip.(string)] = struct{}{}
+	}
+	for _, ip := range delIpsList {
+		delIpsMap[ip.(string)] = struct{}{}
+	}
+	for _, item := range reserved {
+		if _, ok := newIpsMap[item.IP]; ok {
+			continue
+		}
+		if _, ok := delIpsMap[item.IP]; ok {
+			continue
+		}
+		freeIPs = append(freeIPs, item.IP)
+	}
+	return freeIPs
+}
+
+func validateReserveIPs(ctx context.Context, d *schema.ResourceDiff, m interface{}) error {
+	list := d.Get("reserved_ip").(*schema.Set).List()
+	var errs error
+	for _, reservedIP := range list {
+		reservedIPMap := reservedIP.(map[string]interface{})
+		var countIP, ipsLen int
+		if _, ok := reservedIPMap["ip_count"]; ok {
+			countIP = reservedIPMap["ip_count"].(int)
+		}
+		if _, ok := reservedIPMap["ips"]; ok {
+			ipsLen = reservedIPMap["ips"].(*schema.Set).Len()
+		}
+		if ipsLen > countIP {
+			errs = errors.Join(errs, fmt.Errorf("for the reserved_ip block with account_id %d the count parameter must be greater than or equal to len the ips array", reservedIPMap["account_id"].(int)))
+		}
+	}
+	return errs
+}

internal/service/cloudbroker/grid/data_source_grid_get_post_diagnosis.go

@@ -34,21 +34,45 @@ package grid
 
 import (
 	"context"
-	"strconv"
+	"os"
 
+	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	log "github.com/sirupsen/logrus"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 )
 
 func dataSourceGridGetDiagnosisRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	filePath := "diagnosis.tar.gz"
+	if userPath, ok := d.GetOk("file_path"); ok {
+		filePath = userPath.(string)
+	}
+
+	log.Debugf("dataSourceGridGetDiagnosisRead: create file with name: %s", filePath)
+	file, err := os.Create(filePath)
+	defer file.Close()
+	if err != nil {
+		d.SetId("") // ensure ID is empty in this case
+		return diag.FromErr(err)
+	}
+
 	diagnosis, err := utilityGridGetDiagnosisCheckPresence(ctx, d, m)
 	if err != nil {
 		d.SetId("")
 		return diag.FromErr(err)
 	}
-	d.SetId(strconv.Itoa(d.Get("gid").(int)))
-	d.Set("diagnosis", diagnosis)
+
+	log.Debugf("dataSourceGridGetDiagnosisRead: write data to file with name: %s", filePath)
+	_, err = file.WriteString(diagnosis)
+	if err != nil {
+		d.SetId("") // ensure ID is empty in this case
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+
 	return nil
 }
 
@@ -66,29 +90,3 @@ func DataSourceGridGetDiagnosis() *schema.Resource {
 		Schema: dataSourceGridGetDiagnosisSchemaMake(),
 	}
 }
-
-func dataSourceGridPostDiagnosisRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	diagnosis, err := utilityGridPostDiagnosisCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-	d.SetId(strconv.Itoa(d.Get("gid").(int)))
-	d.Set("diagnosis", diagnosis)
-	return nil
-}
-
-func DataSourceGridPostDiagnosis() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceGridPostDiagnosisRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceGridPostDiagnosisSchemaMake(),
-	}
-}

internal/service/cloudbroker/grid/schema.go

@@ -586,23 +586,10 @@ func dataSourceGridGetDiagnosisSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Required: true,
 		},
-		"diagnosis": {
+		"file_path": {
 			Type:     schema.TypeString,
-			Computed: true,
-		},
-	}
-}
-
-func dataSourceGridPostDiagnosisSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"gid": {
-			Type:     schema.TypeInt,
 			Required: true,
 		},
-		"diagnosis": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
 	}
 }
 

internal/service/cloudbroker/grid/utility_grid_get_post_diagnosis.go

@@ -62,23 +62,3 @@ func utilityGridGetDiagnosisCheckPresence(ctx context.Context, d *schema.Resourc
 
 	return gridGetDiagnosis, nil
 }
-
-func utilityGridPostDiagnosisCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (string, error) {
-	c := m.(*controller.ControllerCfg)
-	req := grid.GetDiagnosisRequest{}
-
-	if d.Id() != "" {
-		id, _ := strconv.ParseUint(d.Id(), 10, 64)
-		req.GID = id
-	} else {
-		req.GID = uint64(d.Get("gid").(int))
-	}
-
-	log.Debugf("utilityGridPostDiagnosisCheckPresence: load grid post diagnosis")
-	gridPostDiagnosis, err := c.CloudBroker().Grid().GetDiagnosis(ctx, req)
-	if err != nil {
-		return "", err
-	}
-
-	return gridPostDiagnosis, nil
-}

internal/service/cloudbroker/image/flattens.go

@@ -48,6 +48,7 @@ func flattenImage(d *schema.ResourceData, img *image.RecordImage) {
 	d.Set("sep_id", img.SEPID)
 	d.Set("shared_with", img.SharedWith)
 	d.Set("size", img.Size)
+	d.Set("snapshot_id", img.SnapshotID)
 	d.Set("status", img.Status)
 	d.Set("tech_status", img.TechStatus)
 	d.Set("image_type", img.Type)
@@ -92,47 +93,48 @@ func flattenImageList(il *image.ListImages) []map[string]interface{} {
 		cdPresentedTo, _ := json.Marshal(item.CdPresentedTo)
 
 		temp := map[string]interface{}{
-			"image_id":        item.ID,
-			"unc_path":        item.UNCPath,
-			"account_id":      item.AccountID,
-			"acl":             flattenAcl(item.ACL),
-			"architecture":    item.Architecture,
-			"boot_type":       item.BootType,
-			"bootable":        item.Bootable,
-			"computeci_id":    item.ComputeCIID,
-			"cd_presented_to": string(cdPresentedTo),
-			"deleted_time":    item.DeletedTime,
-			"desc":            item.Description,
-			"drivers":         item.Drivers,
-			"enabled":         item.Enabled,
-			"gid":             item.GID,
-			"guid":            item.GUID,
-			"history":         flattenHistory(item.History),
-			"hot_resize":      item.HotResize,
-			"last_modified":   item.LastModified,
-			"link_to":         item.LinkTo,
-			"milestones":      item.Milestones,
-			"name":            item.Name,
+			"image_id":                 item.ID,
+			"unc_path":                 item.UNCPath,
+			"account_id":               item.AccountID,
+			"acl":                      flattenAcl(item.ACL),
+			"architecture":             item.Architecture,
+			"boot_type":                item.BootType,
+			"bootable":                 item.Bootable,
+			"computeci_id":             item.ComputeCIID,
+			"cd_presented_to":          string(cdPresentedTo),
+			"deleted_time":             item.DeletedTime,
+			"desc":                     item.Description,
+			"drivers":                  item.Drivers,
+			"enabled":                  item.Enabled,
+			"gid":                      item.GID,
+			"guid":                     item.GUID,
+			"history":                  flattenHistory(item.History),
+			"hot_resize":               item.HotResize,
+			"last_modified":            item.LastModified,
+			"link_to":                  item.LinkTo,
+			"milestones":               item.Milestones,
+			"name":                     item.Name,
 			"network_interface_naming": item.NetworkInterfaceNaming,
-			"password":        item.Password,
-			"pool_name":       item.Pool,
-			"present_to":      item.PresentTo,
-			"provider_name":   item.ProviderName,
-			"purge_attempts":  item.PurgeAttempts,
-			"reference_id":    item.ReferenceID,
-			"res_id":          item.ResID,
-			"res_name":        item.ResName,
-			"rescuecd":        item.RescueCD,
-			"sep_id":          item.SEPID,
-			"shared_with":     item.SharedWith,
-			"size":            item.Size,
-			"status":          item.Status,
-			"tech_status":     item.TechStatus,
-			"image_type":      item.Type,
-			"url":             item.URL,
-			"username":        item.Username,
-			"version":         item.Version,
-			"virtual":         item.Virtual,
+			"password":                 item.Password,
+			"pool_name":                item.Pool,
+			"present_to":               item.PresentTo,
+			"provider_name":            item.ProviderName,
+			"purge_attempts":           item.PurgeAttempts,
+			"reference_id":             item.ReferenceID,
+			"res_id":                   item.ResID,
+			"res_name":                 item.ResName,
+			"rescuecd":                 item.RescueCD,
+			"sep_id":                   item.SEPID,
+			"shared_with":              item.SharedWith,
+			"size":                     item.Size,
+			"snapshot_id":              item.SnapshotID,
+			"status":                   item.Status,
+			"tech_status":              item.TechStatus,
+			"image_type":               item.Type,
+			"url":                      item.URL,
+			"username":                 item.Username,
+			"version":                  item.Version,
+			"virtual":                  item.Virtual,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudbroker/image/schema.go

@@ -622,6 +622,11 @@ func dataSourceImageListSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "image size",
 					},
+					"snapshot_id": {
+						Type:        schema.TypeString,
+						Computed:    true,
+						Description: "snapshot id",
+					},
 					"status": {
 						Type:        schema.TypeString,
 						Computed:    true,
@@ -875,6 +880,11 @@ func dataSourceImageSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "image size",
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -1124,6 +1134,11 @@ func resourceCDROMImageSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeInt,
 			},
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -1415,6 +1430,11 @@ func resourceImageSchemaMake() map[string]*schema.Schema {
 				Type: schema.TypeInt,
 			},
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -1689,6 +1709,11 @@ func resourceVirtualImageSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "image size",
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -1967,6 +1992,11 @@ func resourceImageFromBlankComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:     schema.TypeString,
 			Computed: true,
@@ -2241,6 +2271,11 @@ func resourceImageFromPlatformDiskSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeInt,
 			Computed: true,
 		},
+		"snapshot_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "snapshot id",
+		},
 		"status": {
 			Type:     schema.TypeString,
 			Computed: true,

internal/service/cloudbroker/kvmvm/flattens.go

@@ -34,6 +34,7 @@ func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute, p
 	d.Set("affinity_rules", flattenAffinityRules(computeRec.AffinityRules))
 	d.Set("anti_affinity_rules", flattenAffinityRules(computeRec.AntiAffinityRules))
 	d.Set("arch", computeRec.Arch)
+	d.Set("auto_start_w_node", computeRec.AutoStart)
 	d.Set("boot_order", computeRec.BootOrder)
 	d.Set("boot_disk_id", bootDisk.ID)
 	// we intentionally use the SizeMax field, do not change it until the BootDiskSize field is fixed on the platform
@@ -92,6 +93,7 @@ func flattenCompute(d *schema.ResourceData, computeRec *compute.RecordCompute, p
 	d.Set("updated_time", computeRec.UpdatedTime)
 	d.Set("user_data", string(userData))
 	d.Set("user_managed", computeRec.UserManaged)
+	d.Set("vnc_password", computeRec.VNCPassword)
 	d.Set("vgpus", computeRec.VGPUs)
 	d.Set("virtual_image_id", computeRec.VirtualImageID)
 	d.Set("virtual_image_name", computeRec.VirtualImageName)
@@ -294,6 +296,7 @@ func flattenComputeList(computes *compute.ListComputes) []map[string]interface{}
 			"affinity_weight":     computeItem.AffinityWeight,
 			"anti_affinity_rules": flattenListRules(computeItem.AntiAffinityRules),
 			"arch":                computeItem.Arch,
+			"auto_start_w_node":   computeItem.AutoStart,
 			"chipset":             computeItem.Chipset,
 			"cd_image_id":         computeItem.CdImageId,
 			"boot_order":          computeItem.BootOrder,
@@ -613,6 +616,7 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("affinity_weight", compFacts.AffinityWeight)
 	d.Set("anti_affinity_rules", flattenAffinityRules(compFacts.AntiAffinityRules))
 	d.Set("arch", compFacts.Arch)
+	d.Set("auto_start_w_node", compFacts.AutoStart)
 	d.Set("boot_order", compFacts.BootOrder)
 	d.Set("chipset", compFacts.Chipset)
 	d.Set("cd_image_id", compFacts.CdImageId)
@@ -671,6 +675,7 @@ func flattenDataCompute(d *schema.ResourceData, compFacts *compute.RecordCompute
 	d.Set("updated_time", compFacts.UpdatedTime)
 	d.Set("user_data", string(userData))
 	d.Set("user_managed", compFacts.UserManaged)
+	d.Set("vnc_password", compFacts.VNCPassword)
 	d.Set("vgpus", compFacts.VGPUs)
 	d.Set("virtual_image_id", compFacts.VirtualImageID)
 	d.Set("virtual_image_name", compFacts.VirtualImageName)

internal/service/cloudbroker/kvmvm/resource_compute.go

@@ -484,12 +484,29 @@ func resourceComputeCreate(ctx context.Context, d *schema.ResourceData, m interf
 				req.Force = force
 			}
 
+			if autoStart, ok := d.Get("auto_start_w_node").(bool); ok {
+				req.AutoStart = autoStart
+			}
+
 			_, err := c.CloudBroker().Compute().PinToStack(ctx, req)
 			if err != nil {
 				warnings.Add(err)
 			}
 		}
 
+		if !d.Get("pin_to_stack").(bool) && d.Get("auto_start_w_node").(bool) {
+			req := compute.UpdateRequest{
+				ComputeID: computeId,
+				AutoStart: d.Get("auto_start_w_node").(bool),
+				CPUPin:    d.Get("cpu_pin").(bool),
+				HPBacked:  d.Get("hp_backed").(bool),
+			}
+			_, err := c.CloudBroker().Compute().Update(ctx, req)
+			if err != nil {
+				warnings.Add(err)
+			}
+		}
+
 		if d.Get("pause").(bool) {
 			req := compute.PauseRequest{
 				ComputeID: computeId,
@@ -686,7 +703,7 @@ func resourceComputeUpdate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed") {
+	if d.HasChanges("description", "name", "numa_affinity", "cpu_pin", "hp_backed", "chipset", "auto_start_w_node") {
 		if err := utilityComputeUpdate(ctx, d, m); err != nil {
 			return diag.FromErr(err)
 		}
@@ -839,11 +856,14 @@ func ResourceCompute() *schema.Resource {
 		SchemaVersion: 1,
 
 		CustomizeDiff: func(ctx context.Context, diff *schema.ResourceDiff, i interface{}) error {
-			if diff.HasChanges() || diff.HasChanges("libvirt_settings", "network", "affinity_rules", "anti_affinity_rules",
+			if diff.HasChanges() || diff.HasChanges("chipset", "pin_to_stack", "auto_start_w_node", "libvirt_settings", "network", "affinity_rules", "anti_affinity_rules",
 				"disks", "extra_disks", "tags", "port_forwarding", "user_access", "snapshot", "pci_devices") {
 				diff.SetNewComputed("updated_time")
 				diff.SetNewComputed("updated_by")
 			}
+			if diff.HasChanges("pin_to_stack") {
+				diff.SetNewComputed("pinned")
+			}
 			return nil
 		},
 

internal/service/cloudbroker/kvmvm/schema.go

@@ -134,6 +134,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"auto_start_w_node": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
 		"boot_order": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -902,6 +906,10 @@ func dataSourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vgpus": {
 			Type:     schema.TypeList,
 			Computed: true,
@@ -990,6 +998,11 @@ func dataSourceComputeListSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Find by image ID",
 		},
+		"cd_image_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Find by CD image ID",
+		},
 		"extnet_name": {
 			Type:        schema.TypeString,
 			Optional:    true,
@@ -1145,6 +1158,10 @@ func dataSourceComputeListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"auto_start_w_node": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
 					"boot_order": {
 						Type:     schema.TypeList,
 						Computed: true,
@@ -1802,6 +1819,10 @@ func dataSourceComputeListDeletedSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"auto_start_w_node": {
+						Type:     schema.TypeBool,
+						Computed: true,
+					},
 					"boot_order": {
 						Type:     schema.TypeList,
 						Computed: true,
@@ -3375,6 +3396,11 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 			Optional: true,
 			Default:  false,
 		},
+		"auto_start_w_node": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Computed: true,
+		},
 		"target_stack_id": {
 			Type:     schema.TypeInt,
 			Optional: true,
@@ -3906,6 +3932,10 @@ func resourceComputeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"vnc_password": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
 		"vgpus": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudbroker/kvmvm/utility_compute.go

@@ -852,21 +852,17 @@ func utilityComputeUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 	if d.HasChange("numa_affinity") {
 		req.NumaAffinity = d.Get("numa_affinity").(string)
 	}
-	if d.HasChange("cpu_pin") {
-		req.CPUPin = d.Get("cpu_pin").(bool)
-	}
-	if d.HasChange("hp_backed") {
-		req.HPBacked = d.Get("hp_backed").(bool)
-	}
-
 	if d.HasChange("chipset") {
 		req.Chipset = d.Get("chipset").(string)
 	}
+	req.CPUPin = d.Get("cpu_pin").(bool)
+	req.HPBacked = d.Get("hp_backed").(bool)
+	req.AutoStart = d.Get("auto_start_w_node").(bool)
 
 	// Note bene: numa_affinity, cpu_pin and hp_backed are not allowed to be changed for compute in STARTED tech status.
 	// If STARTED, we need to stop it before update
 	var isStopRequired bool
-	if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed") && d.Get("started").(bool) {
+	if d.HasChanges("numa_affinity", "cpu_pin", "hp_backed", "chipset") && d.Get("started").(bool) {
 		isStopRequired = true
 	}
 	if isStopRequired {
@@ -1434,6 +1430,11 @@ func utilityComputePinToStack(ctx context.Context, d *schema.ResourceData, m int
 		if force, ok := d.Get("force_pin").(bool); ok {
 			req.Force = force
 		}
+
+		if autoStart, ok := d.Get("auto_start_w_node").(bool); ok {
+			req.AutoStart = autoStart
+		}
+
 		_, err := c.CloudBroker().Compute().PinToStack(ctx, req)
 		if err != nil {
 			return err

internal/service/cloudbroker/kvmvm/utility_compute_list.go

@@ -75,6 +75,9 @@ func utilityDataComputeListCheckPresence(ctx context.Context, d *schema.Resource
 	if imageID, ok := d.GetOk("image_id"); ok {
 		req.ImageID = imageID.(uint64)
 	}
+	if cdImageID, ok := d.GetOk("cd_image_id"); ok {
+		req.CDImageID = cdImageID.(uint64)
+	}
 	if extNetName, ok := d.GetOk("extnet_name"); ok {
 		req.ExtNetName = extNetName.(string)
 	}

internal/service/cloudbroker/node/flattens.go

@@ -51,6 +51,7 @@ func flattenNode(d *schema.ResourceData, item *node.RecordNode) {
 	d.Set("isolated_cpus", flattenNodeItem(item.IsolatedCpus))
 	d.Set("name", item.Name)
 	d.Set("need_reboot", item.NeedReboot)
+	d.Set("net_addr", flattenGetNetAddr(item.NetAddr))
 	d.Set("nic_info", flattenNicInfo(item.NicInfo))
 	d.Set("numa_topology", flattenNumaTopology(item.NumaTopology))
 	d.Set("reserved_cpus", flattenNodeItem(item.ReservedCPUs))
@@ -205,9 +206,9 @@ func flattenVFList(vfList []interface{}) []map[string]interface{} {
 	return res
 }
 
-func flattenNetAddr(adresses node.ListNetAddr) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0, len(adresses))
-	for _, item := range adresses {
+func flattenNetAddr(addresses node.ListNetAddr) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(addresses))
+	for _, item := range addresses {
 		temp := map[string]interface{}{
 			"cidr":  item.CIDR,
 			"index": item.Index,
@@ -221,6 +222,16 @@ func flattenNetAddr(adresses node.ListNetAddr) []map[string]interface{} {
 	return res
 }
 
+func flattenGetNetAddr(address node.NetAddr) []map[string]interface{} {
+	res := make([]map[string]interface{}, 1)
+	temp := map[string]interface{}{
+		"ip":   address.IP,
+		"name": address.Name,
+	}
+	res[0] = temp
+	return res
+}
+
 func flattenCpuInfo(info node.CpuInfo) []map[string]interface{} {
 	res := make([]map[string]interface{}, 1)
 	temp := map[string]interface{}{

internal/service/cloudbroker/node/schema.go

@@ -131,6 +131,25 @@ func dataSourceNodeSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
+		"net_addr": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"ip": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+					"name": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
 		"nic_info": {
 			Type:     schema.TypeList,
 			Computed: true,

internal/service/cloudbroker/vins/flattens.go

@@ -150,6 +150,7 @@ func flattenVinsVNFDev(vd vins.VNFDev) []map[string]interface{} {
 		"status":        vd.Status,
 		"tech_status":   vd.TechStatus,
 		"type":          vd.Type,
+		"vnc_password":  vd.VNCPassword,
 		"vins":          vd.VINS,
 	}
 	res = append(res, temp)
@@ -371,14 +372,12 @@ func flattenVinsListReservations(li vins.ListReservations) []map[string]interfac
 	res := make([]map[string]interface{}, 0, len(li))
 	for _, v := range li {
 		temp := map[string]interface{}{
-			"client_type": v.ClientType,
-			"description": v.Description,
-			"domain_name": v.DomainName,
-			"host_name":   v.Hostname,
-			"ip":          v.IP,
-			"mac":         v.MAC,
-			"type":        v.Type,
-			"vm_id":       v.VMID,
+			//TODO
+			//"account_id": v.AccountID,
+			"ip":    v.IP,
+			"mac":   v.MAC,
+			"type":  v.Type,
+			"vm_id": v.VMID,
 		}
 		res = append(res, temp)
 	}

internal/service/cloudbroker/vins/resource_vins_static_route.go

@@ -38,14 +38,12 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	log "github.com/sirupsen/logrus"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/vins"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/constants"
 	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/dc"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -64,19 +62,6 @@ func resourceStaticRouteCreate(ctx context.Context, d *schema.ResourceData, m in
 		Gateway:     d.Get("gateway").(string),
 	}
 
-	if computesIDS, ok := d.GetOk("compute_ids"); ok {
-		ids := computesIDS.([]interface{})
-
-		res := make([]uint64, 10)
-
-		for _, id := range ids {
-			computeId := uint64(id.(int))
-			res = append(res, computeId)
-		}
-
-		req.ComputeIds = res
-	}
-
 	_, err := c.CloudBroker().VINS().StaticRouteAdd(ctx, req)
 	if err != nil {
 		d.SetId("")
@@ -108,30 +93,7 @@ func resourceStaticRouteRead(ctx context.Context, d *schema.ResourceData, m inte
 }
 
 func resourceStaticRouteUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	log.Debugf("resourceStaticRouteUpdate: called for static route id %s", d.Id())
-
-	c := m.(*controller.ControllerCfg)
-
-	if diags := checkParamsExistenceStaticRoute(ctx, d, c); diags != nil {
-		return diags
-	}
-
-	staticRouteData, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	warnings := dc.Warnings{}
-	if d.HasChange("compute_ids") {
-		if errs := resourceStaticRouteChangeComputeIds(ctx, d, m, staticRouteData); len(errs) != 0 {
-			for _, err := range errs {
-				warnings.Add(err)
-			}
-		}
-	}
-
-	return append(warnings.Get(), resourceStaticRouteRead(ctx, d, m)...)
+	return nil
 }
 
 func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
@@ -158,61 +120,6 @@ func resourceStaticRouteDelete(ctx context.Context, d *schema.ResourceData, m in
 	return nil
 }
 
-func resourceStaticRouteChangeComputeIds(ctx context.Context, d *schema.ResourceData, m interface{}, staticRouteData *vins.ItemRoutes) []error {
-	c := m.(*controller.ControllerCfg)
-
-	var errs []error
-
-	vinsId := uint64(d.Get("vins_id").(int))
-
-	deletedIds := make([]uint64, 0)
-	addedIds := make([]uint64, 0)
-
-	oldComputeIds, newComputeIds := d.GetChange("compute_ids")
-	oldComputeIdsSlice := oldComputeIds.([]interface{})
-	newComputeIdsSlice := newComputeIds.([]interface{})
-
-	for _, el := range oldComputeIdsSlice {
-		if !isContainsIds(newComputeIdsSlice, el) {
-			convertedEl := uint64(el.(int))
-			deletedIds = append(deletedIds, convertedEl)
-		}
-	}
-
-	for _, el := range newComputeIdsSlice {
-		if !isContainsIds(oldComputeIdsSlice, el) {
-			convertedEl := uint64(el.(int))
-			addedIds = append(addedIds, convertedEl)
-		}
-	}
-
-	if len(deletedIds) > 0 {
-		req := vins.StaticRouteAccessRevokeRequest{
-			VINSID:     vinsId,
-			RouteId:    staticRouteData.ID,
-			ComputeIds: deletedIds,
-		}
-
-		if _, err := c.CloudBroker().VINS().StaticRouteAccessRevoke(ctx, req); err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	if len(addedIds) > 0 {
-		req := vins.StaticRouteAccessGrantRequest{
-			VINSID:     vinsId,
-			RouteId:    staticRouteData.ID,
-			ComputeIds: addedIds,
-		}
-
-		if _, err := c.CloudBroker().VINS().StaticRouteAccessGrant(ctx, req); err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	return errs
-}
-
 func isContainsIds(els []interface{}, el interface{}) bool {
 	convEl := el.(int)
 	for _, elOld := range els {

internal/service/cloudbroker/vins/schema.go

@@ -341,6 +341,10 @@ func dataSourceVinsSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "type",
 					},
+					"vnc_password": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"vins": {
 						Type:        schema.TypeList,
 						Computed:    true,
@@ -2509,6 +2513,10 @@ func resourceVinsSchemaMake() map[string]*schema.Schema {
 						Computed:    true,
 						Description: "type",
 					},
+					"vnc_password": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
 					"vins": {
 						Type:        schema.TypeList,
 						Computed:    true,
@@ -3389,7 +3397,6 @@ func resourceStaticRouteSchemaMake() map[string]*schema.Schema {
 		"compute_ids": {
 			Type:     schema.TypeList,
 			Computed: true,
-			Optional: true,
 			Elem: &schema.Schema{
 				Type: schema.TypeInt,
 			},