4.6.0

internal/service/cloudapi/vins/data_source_static_route.go

@@ -1,108 +1,108 @@
-/*
-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"
-	"strconv"
-
-	"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 dataSourceStaticRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	staticRoute, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	d.SetId(strconv.FormatUint(staticRoute.ID, 10))
-	flattenStaticRouteData(d, staticRoute)
-	return nil
-}
-
-func dataSourceStaticRouteSchemaMake() map[string]*schema.Schema {
-	rets := map[string]*schema.Schema{
-		"vins_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "Unique ID of the ViNS",
-		},
-		"route_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "Unique ID of the static route",
-		},
-		"compute_ids": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"destination": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"gateway": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"netmask": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-	}
-	return rets
-}
-
-func DataSourceStaticRoute() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceStaticRouteRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceStaticRouteSchemaMake(),
-	}
-}
+/*
+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"
+	"strconv"
+
+	"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 dataSourceStaticRouteRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	staticRoute, err := utilityDataStaticRouteCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	d.SetId(strconv.FormatUint(staticRoute.ID, 10))
+	flattenStaticRouteData(d, staticRoute)
+	return nil
+}
+
+func dataSourceStaticRouteSchemaMake() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"vins_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "Unique ID of the ViNS",
+		},
+		"route_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "Unique ID of the static route",
+		},
+		"compute_ids": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeInt,
+			},
+		},
+		"destination": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"gateway": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"guid": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"netmask": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+	}
+	return rets
+}
+
+func DataSourceStaticRoute() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceStaticRouteRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceStaticRouteSchemaMake(),
+	}
+}

internal/service/cloudapi/vins/data_source_static_route_list.go

@@ -1,122 +1,122 @@
-/*
-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"
-
-	"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 dataSourceStaticRouteListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	staticRouteList, err := utilityStaticRouteListCheckPresence(ctx, d, m)
-	if err != nil {
-		d.SetId("")
-		return diag.FromErr(err)
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenStaticRouteList(staticRouteList))
-	d.Set("entry_count", staticRouteList.EntryCount)
-
-	return nil
-}
-
-func dataSourceStaticRouteListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"vins_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of VINS",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"compute_ids": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"destination": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"gateway": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"netmask": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"route_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"entry_count": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-	return res
-}
-
-func DataSourceStaticRouteList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		ReadContext: dataSourceStaticRouteListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &constants.Timeout30s,
-			Default: &constants.Timeout60s,
-		},
-
-		Schema: dataSourceStaticRouteListSchemaMake(),
-	}
-}
+/*
+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"
+
+	"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 dataSourceStaticRouteListRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	staticRouteList, err := utilityStaticRouteListCheckPresence(ctx, d, m)
+	if err != nil {
+		d.SetId("")
+		return diag.FromErr(err)
+	}
+
+	id := uuid.New()
+	d.SetId(id.String())
+	d.Set("items", flattenStaticRouteList(staticRouteList))
+	d.Set("entry_count", staticRouteList.EntryCount)
+
+	return nil
+}
+
+func dataSourceStaticRouteListSchemaMake() map[string]*schema.Schema {
+	res := map[string]*schema.Schema{
+		"vins_id": {
+			Type:        schema.TypeInt,
+			Required:    true,
+			Description: "ID of VINS",
+		},
+		"items": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"compute_ids": {
+						Type:     schema.TypeList,
+						Computed: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeInt,
+						},
+					},
+					"destination": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"gateway": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"guid": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"netmask": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"route_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+				},
+			},
+		},
+		"entry_count": {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
+	}
+	return res
+}
+
+func DataSourceStaticRouteList() *schema.Resource {
+	return &schema.Resource{
+		SchemaVersion: 1,
+
+		ReadContext: dataSourceStaticRouteListRead,
+
+		Timeouts: &schema.ResourceTimeout{
+			Read:    &constants.Timeout30s,
+			Default: &constants.Timeout60s,
+		},
+
+		Schema: dataSourceStaticRouteListSchemaMake(),
+	}
+}

internal/service/cloudapi/vins/data_source_vins.go

@@ -170,6 +170,10 @@ func vnfInterfaceSchemaMake() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"node_id" : {
+			Type:     schema.TypeInt,
+			Computed: true,
+		},
 		"pci_slot": {
 			Type:     schema.TypeInt,
 			Computed: true,
@@ -545,7 +549,6 @@ func routesSchemaMake() map[string]*schema.Schema {
 	}
 }
 
-
 func gwConfigSchemaMake() map[string]*schema.Schema {
 	return map[string]*schema.Schema{
 		"default_gw": {

internal/service/cloudapi/vins/data_source_vins_list.go

@@ -89,6 +89,11 @@ func dataSourceVinsListSchemaMake() map[string]*schema.Schema {
 			Default:     false,
 			Description: "Include deleted computes",
 		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,
@@ -132,6 +137,14 @@ func dataSourceVinsListSchemaMake() map[string]*schema.Schema {
 						Type:     schema.TypeString,
 						Computed: true,
 					},
+					"extnet_id": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
+					"free_ips": {
+						Type:     schema.TypeInt,
+						Computed: true,
+					},
 					"vins_id": {
 						Type:     schema.TypeInt,
 						Computed: true,

internal/service/cloudapi/vins/data_source_vins_list_deleted.go

@@ -50,7 +50,7 @@ func dataSourceVinsListDeletedRead(ctx context.Context, d *schema.ResourceData,
 
 	id := uuid.New()
 	d.SetId(id.String())
-	d.Set("items", flattenVinsList(vinsList))
+	d.Set("items", flattenVinsListDeleted(vinsList))
 	d.Set("entry_count", vinsList.EntryCount)
 
 	return nil
@@ -83,6 +83,16 @@ func dataSourceVinsListDeletedSchemaMake() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Filter by external IP",
 		},
+		"vnfdev_id": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "find by VNF Device id",
+		},
+		"sort_by": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "sort by one of supported fields, format +|-(field)",
+		},
 		"page": {
 			Type:        schema.TypeInt,
 			Optional:    true,

internal/service/cloudapi/vins/flattens.go

@@ -100,6 +100,7 @@ func flattenInterfaces(interfaces []vins.ItemVNFInterface) []map[string]interfac
 			"net_id":       vnfInterface.NetID,
 			"net_mask":     vnfInterface.NetMask,
 			"net_type":     vnfInterface.NetType,
+			"node_id":      vnfInterface.NodeID,
 			"pci_slot":     vnfInterface.PCISlot,
 			"qos":          flattenQOS(vnfInterface.QOS),
 			"target":       vnfInterface.Target,
@@ -485,6 +486,34 @@ func flattenVinsIpList(ips *vins.ListIPs) []map[string]interface{} {
 }
 
 func flattenVinsList(vl *vins.ListVINS) []map[string]interface{} {
+	res := make([]map[string]interface{}, 0, len(vl.Data))
+	for _, v := range vl.Data {
+		temp := map[string]interface{}{
+			"account_id":   v.AccountID,
+			"account_name": v.AccountName,
+			"created_by":   v.CreatedBy,
+			"created_time": v.CreatedTime,
+			"deleted_by":   v.DeletedBy,
+			"deleted_time": v.DeletedTime,
+			"external_ip":  v.ExternalIP,
+			"extnet_id":    v.ExtnetId,
+			"free_ips":     v.FreeIPs,
+			"vins_id":      v.ID,
+			"vins_name":    v.Name,
+			"network":      v.Network,
+			"rg_id":        v.RGID,
+			"rg_name":      v.RGName,
+			"status":       v.Status,
+			"updated_by":   v.UpdatedBy,
+			"updated_time": v.UpdatedTime,
+			"vxlan_id":     v.VXLANID,
+		}
+		res = append(res, temp)
+	}
+	return res
+}
+
+func flattenVinsListDeleted(vl *vins.ListVINS) []map[string]interface{} {
 	res := make([]map[string]interface{}, 0, len(vl.Data))
 	for _, v := range vl.Data {
 		temp := map[string]interface{}{

internal/service/cloudapi/vins/resource_vins.go

@@ -132,6 +132,13 @@ func resourceVinsCreate(ctx context.Context, d *schema.ResourceData, m interface
 		if preReservationsNum, ok := d.GetOk("pre_reservations_num"); ok {
 			req.PreReservationsNum = uint64(preReservationsNum.(int))
 		}
+		if dns, ok := d.GetOk("dns"); ok {
+			dnsInterface := dns.(*schema.Set).List()
+			req.DNSList = make([]string, 0, len(dnsInterface))
+			for _, item := range dnsInterface {
+				req.DNSList = append(req.DNSList, item.(string))
+			}
+		}
 
 		id, err := c.CloudAPI().VINS().CreateInRG(ctx, req)
 		if err != nil {
@@ -158,6 +165,13 @@ func resourceVinsCreate(ctx context.Context, d *schema.ResourceData, m interface
 		if preReservationsNum, ok := d.GetOk("pre_reservations_num"); ok {
 			req.PreReservationsNum = uint64(preReservationsNum.(int))
 		}
+		if dns, ok := d.GetOk("dns"); ok {
+			dnsInterface := dns.(*schema.Set).List()
+			req.DNSList = make([]string, 0, len(dnsInterface))
+			for _, item := range dnsInterface {
+				req.DNSList = append(req.DNSList, item.(string))
+			}
+		}
 
 		id, err := c.CloudAPI().VINS().CreateInAccount(ctx, req)
 		if err != nil {
@@ -388,7 +402,7 @@ func resourceVinsUpdate(ctx context.Context, d *schema.ResourceData, m interface
 		return diag.Errorf("The resource cannot be updated because it has been destroyed")
 		// return resourceVinsCreate(ctx, d, m)
 	case status.Deleted:
-		if restore, ok:= d.GetOk("restore"); ok && restore.(bool) {
+		if restore, ok := d.GetOk("restore"); ok && restore.(bool) {
 			req := vins.RestoreRequest{
 				VINSID: vinsData.ID,
 			}
@@ -623,6 +637,25 @@ func resourceVinsUpdate(ctx context.Context, d *schema.ResourceData, m interface
 		}
 	}
 
+	if d.HasChange("dns") {
+		// empty "dns" is allowed, it will update vnfs.dhcp.config.dns from current values to empty list
+		dnsInterface := d.Get("dns").(*schema.Set).List()
+		dnsList := make([]string, 0, len(dnsInterface))
+		for _, item := range dnsInterface {
+			dnsList = append(dnsList, item.(string))
+		}
+
+		req := vins.DNSApplyRequest{
+			VINSID:  vinsData.ID,
+			DNSList: dnsList,
+		}
+
+		_, err := c.CloudAPI().VINS().DNSApply(ctx, req)
+		if err != nil {
+			warnings.Add(err)
+		}
+	}
+
 	if d.HasChange("vnfdev_restart") {
 		if oldRestart, newRestart := d.GetChange("vnfdev_restart"); oldRestart == false && newRestart == true {
 			req := vins.VNFDevRestartRequest{VINSID: vinsData.ID}
@@ -835,6 +868,13 @@ func resourceVinsSchemaMake() map[string]*schema.Schema {
 		Optional: true,
 		Default:  false,
 	}
+	rets["dns"] = &schema.Schema{
+		Type:     schema.TypeSet,
+		Optional: true,
+		Elem: &schema.Schema{
+			Type: schema.TypeString,
+		},
+	}
 	rets["vins_id"] = &schema.Schema{
 		Type:        schema.TypeInt,
 		Computed:    true,

internal/service/cloudapi/vins/utility_vins_list.go

@@ -1,86 +1,91 @@
-/*
-Copyright (c) 2019-2023 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"
-
-	log "github.com/sirupsen/logrus"
-	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
-	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
-
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-)
-
-func utilityVinsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*vins.ListVINS, error) {
-	c := m.(*controller.ControllerCfg)
-	req := vins.ListRequest{}
-
-	if by_id, ok := d.GetOk("by_id"); ok {
-		req.ByID = uint64(by_id.(int))
-	}
-
-	if name, ok := d.GetOk("name"); ok {
-		req.Name = name.(string)
-	}
-
-	if account_id, ok := d.GetOk("account_id"); ok {
-		req.AccountID = uint64(account_id.(int))
-	}
-
-	if rg_id, ok := d.GetOk("rg_id"); ok {
-		req.RGID = uint64(rg_id.(int))
-	}
-
-	if ext_ip, ok := d.GetOk("ext_ip"); ok {
-		req.ExtIP = ext_ip.(string)
-	}
-
-	if includeDeleted, ok := d.GetOk("include_deleted"); ok {
-		req.IncludeDeleted = includeDeleted.(bool)
-	}
-	if page, ok := d.GetOk("page"); ok {
-		req.Page = uint64(page.(int))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		req.Size = uint64(size.(int))
-	}
-
-	log.Debugf("utilityVinsListCheckPresence")
-	vinsList, err := c.CloudAPI().VINS().List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	return vinsList, nil
-}
+/*
+Copyright (c) 2019-2023 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"
+
+	log "github.com/sirupsen/logrus"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
+	"repository.basistech.ru/BASIS/terraform-provider-decort/internal/controller"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func utilityVinsListCheckPresence(ctx context.Context, d *schema.ResourceData, m interface{}) (*vins.ListVINS, error) {
+	c := m.(*controller.ControllerCfg)
+	req := vins.ListRequest{}
+
+	if by_id, ok := d.GetOk("by_id"); ok {
+		req.ByID = uint64(by_id.(int))
+	}
+
+	if name, ok := d.GetOk("name"); ok {
+		req.Name = name.(string)
+	}
+
+	if account_id, ok := d.GetOk("account_id"); ok {
+		req.AccountID = uint64(account_id.(int))
+	}
+
+	if rg_id, ok := d.GetOk("rg_id"); ok {
+		req.RGID = uint64(rg_id.(int))
+	}
+
+	if ext_ip, ok := d.GetOk("ext_ip"); ok {
+		req.ExtIP = ext_ip.(string)
+	}
+
+	if includeDeleted, ok := d.GetOk("include_deleted"); ok {
+		req.IncludeDeleted = includeDeleted.(bool)
+	}
+
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
+	if page, ok := d.GetOk("page"); ok {
+		req.Page = uint64(page.(int))
+	}
+	if size, ok := d.GetOk("size"); ok {
+		req.Size = uint64(size.(int))
+	}
+
+	log.Debugf("utilityVinsListCheckPresence")
+	vinsList, err := c.CloudAPI().VINS().List(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return vinsList, nil
+}

internal/service/cloudapi/vins/utility_vins_list_deleted.go

@@ -52,6 +52,10 @@ func utilityVinsListDeletedCheckPresence(ctx context.Context, d *schema.Resource
 		req.Size = uint64(size.(int))
 	}
 
+	if sortBy, ok := d.GetOk("sort_by"); ok {
+		req.SortBy = sortBy.(string)
+	}
+
 	if by_id, ok := d.GetOk("by_id"); ok {
 		req.ByID = uint64(by_id.(int))
 	}
@@ -71,6 +75,9 @@ func utilityVinsListDeletedCheckPresence(ctx context.Context, d *schema.Resource
 	if ext_ip, ok := d.GetOk("ext_ip"); ok {
 		req.ExtIP = ext_ip.(string)
 	}
+	if VNFDevId, ok := d.GetOk("vnfdev_id"); ok {
+		req.VNFDevID = uint64(VNFDevId.(int))
+	}
 
 	log.Debugf("utilityVinsListDeletedCheckPresence")
 	vinsList, err := c.CloudAPI().VINS().ListDeleted(ctx, req)