k8s, k8s_wg: single worker add/delete support; github actions support

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release to registry
 on:
   push:
     tags:

.golangci.yml

@@ -1,33 +0,0 @@
-linters:
-  enable:
-    - bodyclose
-    - decorder
-    - dogsled
-    - errorlint
-    - exportloopref
-    - gocognit
-    - goconst
-    - gocyclo
-    - gosec
-    - ifshort
-    - makezero
-    #- nestif - disabled till better times
-    - nilerr
-    - prealloc
-    - unconvert
-    - unparam
-
-linters-settings:
-  errcheck:
-    exclude-functions:
-      - (*github.com/hashicorp/terraform-plugin-sdk/helper/schema.ResourceData).Set
-  staticcheck:
-    go: "1.18"
-    checks:
-      - all
-      - -SA1019
-  nestif:
-    min-complexity: 7
-
-issues:
-  max-same-issues: 0

CHANGELOG.md

@@ -1,2 +1,16 @@
-### Resources updated
-- kvmvm - added sep\_id and pool parameters
+## 2.0
+
+### New data sources
+- image
+- image\_list
+- grid
+- grid\_list
+- image\_list\_stacks
+
+### New resources
+- image
+- virtual\_image
+- cdrom\_image
+- delete\_images
+- k8s
+- k8s\_wg

Jenkinsfile-sast

@@ -1,52 +0,0 @@
-pipeline {
-    agent {
-        kubernetes {
-            yaml '''
-apiVersion: v1
-kind: Pod
-spec:
-  containers:
-  - name: alpine
-    image: alpine:3.15
-    command:
-      - sleep
-      - infinity
-'''
-        }
-    }
-    stages {
-        stage('Dependency check') {
-            environment {
-                DEPCHECKDB = credentials('depcheck-postgres')
-            }
-            steps {
-                container('alpine') {
-                    sh 'apk update && apk add openjdk11 java-postgresql-jdbc go'
-                    dependencyCheck additionalArguments: '-f JSON -f HTML -n --enableExperimental \
-                        -l deplog \
-                        --dbDriverName org.postgresql.Driver \
-                        --dbDriverPath /usr/share/java/postgresql-jdbc.jar \
-                        --dbUser $DEPCHECKDB_USR \
-                        --dbPassword $DEPCHECKDB_PSW \
-                        --connectionString jdbc:postgresql://postgres-postgresql.postgres/depcheck', odcInstallation: 'depcheck'
-                    sh 'cat deplog'
-                }
-            }
-        }
-        stage('SonarQube analysis') {
-            environment {
-                SONARSCANNER_HOME = tool 'sonarscanner'
-            }
-            steps {
-                withSonarQubeEnv('sonarqube') {
-                    sh '$SONARSCANNER_HOME/bin/sonar-scanner'
-                }
-            }
-        }
-        stage('SonarQube quality gate') {
-            steps {
-                waitForQualityGate webhookSecretId: 'sonar-webhook', abortPipeline: true
-            }
-        }
-    }
-}

README.md

@@ -10,17 +10,12 @@ Terraform provider для платформы Digital Energy Cloud Orchestration
 - Работа с Compute instances, 
 - Работа с disks, 
 - Работа с k8s,
+- Работа с virtual network segments,
 - Работа с image,
 - Работа с reource groups,
 - Работа с VINS,
 - Работа с pfw,
-- Работа с accounts,
-- Работа с snapshots,
-- Работа с pcidevice,
-- Работа с sep,
-- Работа с vgpu,
-- Работа с bservice,
-- Работа с extnets.
+- Работа с accounts.
 
 Вики проекта: https://github.com/rudecs/terraform-provider-decort/wiki
 
@@ -70,7 +65,7 @@ Linux:
 ```
 Windows:
 ```powershell
-%APPDATA%\terraform.d\plugins\${host_name}\${namespace}\${type}\${version}\${target}
+%APPDATA%\terraform.d\plugins\${host_name}/${namespace}/${type}/${version}/${target}
 ```
 ВНИМАНИЕ: для ОС Windows `%APP_DATA%` является каталогом, в котором будут помещены будущие файлы terraform.
 Где:
@@ -112,11 +107,8 @@ terraform init
 Более подробно о сборке провайдера можно найти по ссылке: https://learn.hashicorp.com/tutorials/terraform/provider-use?in=terraform/providers
 
 ## Примеры работы
-Примеры работы можно найти:
-- На вики проекта: https://github.com/rudecs/terraform-provider-decort/wiki
-- В папке `samples`  
-
-Схемы к terraform'у доступны:
-- В папке `docs`  
+Примеры работы можно найти на:
+- Вики проекта: https://github.com/rudecs/terraform-provider-decort/wiki
+- В папке `samples`
 
 Хорошей работы!

README_EN.md

@@ -9,17 +9,12 @@ NOTE: provider rc-1.25 is designed for DECORT API 3.7.x. For older API versions
 - Work with Compute instances, 
 - Work with disks, 
 - Work with k8s,
+- Work with virtual network segments,
 - Work with image,
 - Work with reource groups,
 - Work with VINS,
 - Work with pfw,
-- Work with accounts,
-- Work with snapshots,
-- Work with pcidevice.
-- Work with sep,
-- Work with vgpu,
-- Work with bservice,
-- Work with extnets.
+- Work with accounts.
 
 This provider supports Import operations on pre-existing resources.
 
@@ -115,9 +110,6 @@ More details about the provider's building process: https://learn.hashicorp.com/
 
 ## Examples and Samples
 - Examples: https://github.com/rudecs/terraform-provider-decort/wiki
-- Samples: see in repository `samples`  
-
-Terraform schemas in:
-- See in repository `docs`  
+- Samples: in repository `samples`
 
 Good work!

decort/controller.go

@@ -33,7 +33,6 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
-	"time"
 
 	// "time"
 
@@ -93,7 +92,8 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 		decort_username: "",
 	}
 
-	allow_unverified_ssl := d.Get("allow_unverified_ssl").(bool)
+	var allow_unverified_ssl bool
+	allow_unverified_ssl = d.Get("allow_unverified_ssl").(bool)
 
 	if ret_config.controller_url == "" {
 		return nil, fmt.Errorf("Empty DECORT cloud controller URL provided.")
@@ -136,12 +136,15 @@ func ControllerConfigure(d *schema.ResourceData) (*ControllerCfg, error) {
 
 	if allow_unverified_ssl {
 		log.Warn("ControllerConfigure: allow_unverified_ssl is set - will not check certificates!")
-		transCfg := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}} //nolint:gosec
+		transCfg := &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}
 		ret_config.cc_client = &http.Client{
 			Transport: transCfg,
+			Timeout:   Timeout180s,
 		}
 	} else {
-		ret_config.cc_client = &http.Client{}
+		ret_config.cc_client = &http.Client{
+			Timeout: Timeout180s, // time.Second * 30,
+		}
 	}
 
 	switch ret_config.auth_mode_code {
@@ -331,7 +334,7 @@ func (config *ControllerCfg) validateLegacyUser() (bool, error) {
 	return true, nil
 }
 
-func (config *ControllerCfg) decortAPICall(method string, api_name string, url_values *url.Values) (json_resp string, err error) { //nolint:unparam
+func (config *ControllerCfg) decortAPICall(method string, api_name string, url_values *url.Values) (json_resp string, err error) {
 	// This is a convenience wrapper around standard HTTP request methods that is aware of the
 	// authorization mode for which the provider was initialized and compiles request accordingly.
 
@@ -375,34 +378,28 @@ func (config *ControllerCfg) decortAPICall(method string, api_name string, url_v
 		req.Header.Set("Authorization", fmt.Sprintf("bearer %s", config.jwt))
 	}
 
-	var resp *http.Response
-	var body []byte
-	for i := 0; i < 5; i++ {
-		resp, err = config.cc_client.Do(req)
-		if err != nil {
-			return "", err
-		}
+	resp, err := config.cc_client.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
 
-		body, err = ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return "", err
-		}
-		resp.Body.Close()
-		log.Debugf("decortAPICall: %s %s\n %s", method, api_name, body)
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return "", err
+	}
+	log.Debugf("decortAPICall: %s %s\n %s", method, api_name, body)
 
-		if resp.StatusCode == http.StatusOK {
-			return string(body), nil
-		} else {
-			if resp.StatusCode == http.StatusInternalServerError {
-				log.Warnf("got 500, retrying %d/5", i+1)
-				time.Sleep(time.Second * 5)
-				continue
-			}
-			return "", fmt.Errorf("decortAPICall: unexpected status code %d when calling API %q with request Body %q. Respone:\n%s",
-				resp.StatusCode, req.URL, params_str, body)
-		}
+	if resp.StatusCode == http.StatusOK {
+		return string(body), nil
+	} else {
+		return "", fmt.Errorf("decortAPICall: unexpected status code %d when calling API %q with request Body %q. Respone:\n%s",
+			resp.StatusCode, req.URL, params_str, body)
 	}
 
-	return "", fmt.Errorf("decortAPICall: unexpected status code %d when calling API %q with request Body %q. Respone:\n%s",
-		resp.StatusCode, req.URL, params_str, body)
+	/*
+			if resp.StatusCode == StatusServiceUnavailable {
+		        return nil, fmt.Errorf("decortAPICall method called for incompatible authorization mode %q.", config.auth_mode_txt)
+			}
+	*/
 }

decort/data_source_account.go

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
+Copyright (c) 2019-2021 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Author: Sergey Shubin, <sergey.shubin@digitalenergy.online>, <svs1370@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,380 +25,45 @@ Visit https://github.com/rudecs/terraform-provider-decort for full source code p
 package decort
 
 import (
-	"github.com/google/uuid"
+	"encoding/json"
+	"fmt"
+	// "net/url"
+
+	log "github.com/sirupsen/logrus"
+
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
-func dataSourceAccountRead(d *schema.ResourceData, m interface{}) error {
-	acc, err := utilityAccountCheckPresence(d, m)
+func flattenAccount(d *schema.ResourceData, acc_facts string) error {
+	// NOTE: this function modifies ResourceData argument - as such it should never be called
+	// from resourceAccountExists(...) method
+
+	// log.Debugf("flattenAccount: ready to decode response body from %q", CloudspacesGetAPI)
+	details := AccountRecord{}
+	err := json.Unmarshal([]byte(acc_facts), &details)
 	if err != nil {
 		return err
 	}
 
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("dc_location", acc.DCLocation)
-	d.Set("resources", flattenAccResources(acc.Resources))
-	d.Set("ckey", acc.CKey)
-	d.Set("meta", flattenMeta(acc.Meta))
-	d.Set("acl", flattenAccAcl(acc.Acl))
-	d.Set("company", acc.Company)
-	d.Set("companyurl", acc.CompanyUrl)
-	d.Set("created_by", acc.CreatedBy)
-	d.Set("created_time", acc.CreatedTime)
-	d.Set("deactivation_time", acc.DeactiovationTime)
-	d.Set("deleted_by", acc.DeletedBy)
-	d.Set("deleted_time", acc.DeletedTime)
-	d.Set("displayname", acc.DisplayName)
-	d.Set("guid", acc.GUID)
-	d.Set("account_id", acc.ID)
-	d.Set("account_name", acc.Name)
-	d.Set("resource_limits", flattenRgResourceLimits(acc.ResourceLimits))
-	d.Set("send_access_emails", acc.SendAccessEmails)
-	d.Set("service_account", acc.ServiceAccount)
-	d.Set("status", acc.Status)
-	d.Set("updated_time", acc.UpdatedTime)
-	d.Set("version", acc.Version)
-	d.Set("vins", acc.Vins)
-	d.Set("vinses", acc.Vinses)
-	d.Set("computes", flattenAccComputes(acc.Computes))
-	d.Set("machines", flattenAccMachines(acc.Machines))
+	log.Debugf("flattenAccount: decoded Account name %q / ID %d, status %q", details.Name, details.ID, details.Status)
+
+	d.SetId(fmt.Sprintf("%d", details.ID))
+	d.Set("name", details.Name)
+	d.Set("status", details.Status)
+
 	return nil
 }
 
-func flattenAccComputes(acs Computes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"started": acs.Started,
-		"stopped": acs.Stopped,
+func dataSourceAccountRead(d *schema.ResourceData, m interface{}) error {
+	acc_facts, err := utilityAccountCheckPresence(d, m)
+	if acc_facts == "" {
+		// if empty string is returned from utilityAccountCheckPresence then there is no
+		// such account and err tells so - just return it to the calling party
+		d.SetId("") // ensure ID is empty in this case
+		return err
 	}
-	res = append(res, temp)
-	return res
-}
 
-func flattenAccMachines(ams Machines) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"running": ams.Running,
-		"halted":  ams.Halted,
-	}
-	res = append(res, temp)
-	return res
-}
-
-func flattenAccAcl(acls []AccountAclRecord) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, acls := range acls {
-		temp := map[string]interface{}{
-			"can_be_deleted": acls.CanBeDeleted,
-			"explicit":       acls.IsExplicit,
-			"guid":           acls.Guid,
-			"right":          acls.Rights,
-			"status":         acls.Status,
-			"type":           acls.Type,
-			"user_group_id":  acls.UgroupID,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func flattenAccResources(r Resources) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"current":  flattenAccResource(r.Current),
-		"reserved": flattenAccResource(r.Reserved),
-	}
-	res = append(res, temp)
-	return res
-}
-
-func flattenAccResource(r Resource) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"cpu":        r.CPU,
-		"disksize":   r.Disksize,
-		"extips":     r.Extips,
-		"exttraffic": r.Exttraffic,
-		"gpu":        r.GPU,
-		"ram":        r.RAM,
-	}
-	res = append(res, temp)
-	return res
-}
-
-func dataSourceAccountSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"dc_location": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"resources": {
-			Type:     schema.TypeList,
-			Computed: true,
-			MaxItems: 1,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"current": {
-						Type:     schema.TypeList,
-						Computed: true,
-						MaxItems: 1,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"cpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"disksize": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"extips": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"exttraffic": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"gpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"ram": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"reserved": {
-						Type:     schema.TypeList,
-						Computed: true,
-						MaxItems: 1,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"cpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"disksize": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"extips": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"exttraffic": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"gpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"ram": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"acl": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"can_be_deleted": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"explicit": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"right": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"user_group_id": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"company": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"companyurl": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"deactivation_time": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"displayname": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"account_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"resource_limits": {
-			Type:     schema.TypeList,
-			Computed: true,
-			MaxItems: 1,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"cu_c": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"cu_d": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"cu_i": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"cu_m": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"cu_np": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"gpu_units": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"send_access_emails": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"service_account": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"version": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"vins": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"computes": {
-			Type:     schema.TypeList,
-			Computed: true,
-			MaxItems: 1,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"started": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"stopped": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"machines": {
-			Type:     schema.TypeList,
-			Computed: true,
-			MaxItems: 1,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"halted": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"running": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"vinses": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-	return res
+	return flattenAccount(d, acc_facts)
 }
 
 func dataSourceAccount() *schema.Resource {
@@ -412,6 +77,56 @@ func dataSourceAccount() *schema.Resource {
 			Default: &Timeout60s,
 		},
 
-		Schema: dataSourceAccountSchemaMake(),
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "Name of the account. Names are case sensitive and unique.",
+			},
+
+			"account_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "Unique ID of the account. If account ID is specified, then account name is ignored.",
+			},
+
+			"status": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Current status of the account.",
+			},
+
+			/* We keep the following attributes commented out, as we are not implementing account
+			   management with Terraform plugin, so we do not need this extra info.
+
+			"quota": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: quotaRgSubresourceSchema(), // this is a dictionary
+				},
+				Description: "Quotas on the resources for this account and all its resource groups.",
+			},
+
+			"resource_groups": {
+				Type:         schema.TypeList,
+				Computed:     true,
+				Elem: &schema.Schema {
+					Type:  schema.TypeInt,
+				},
+				Description:  "IDs of resource groups in this account."
+			},
+
+			"vins": {
+				Type:         schema.TypeList,
+				Computed:     true,
+				Elem: &schema.Schema {
+					Type:  schema.TypeInt,
+				},
+				Description:  "IDs of VINSes created at the account level."
+			},
+			*/
+		},
 	}
 }

decort/data_source_account_audits_list.go

@@ -1,114 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenAccountAuditsList(aal AccountAuditsList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, aa := range aal {
-		temp := map[string]interface{}{
-			"call":         aa.Call,
-			"responsetime": aa.ResponseTime,
-			"statuscode":   aa.StatusCode,
-			"timestamp":    aa.Timestamp,
-			"user":         aa.User,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountAuditsListRead(d *schema.ResourceData, m interface{}) error {
-	accountAuditsList, err := utilityAccountAuditsListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountAuditsList(accountAuditsList))
-
-	return nil
-}
-
-func dataSourceAccountAuditsListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"call": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"responsetime": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"statuscode": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"timestamp": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"user": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceAccountAuditsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountAuditsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountAuditsListSchemaMake(),
-	}
-}

decort/data_source_account_computes_list.go

@@ -1,189 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenAccountComputesList(acl AccountComputesList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, acc := range acl {
-		temp := map[string]interface{}{
-			"account_id":       acc.AccountId,
-			"account_name":     acc.AccountName,
-			"cpus":             acc.CPUs,
-			"created_by":       acc.CreatedBy,
-			"created_time":     acc.CreatedTime,
-			"deleted_by":       acc.DeletedBy,
-			"deleted_time":     acc.DeletedTime,
-			"compute_id":       acc.ComputeId,
-			"compute_name":     acc.ComputeName,
-			"ram":              acc.RAM,
-			"registered":       acc.Registered,
-			"rg_id":            acc.RgId,
-			"rg_name":          acc.RgName,
-			"status":           acc.Status,
-			"tech_status":      acc.TechStatus,
-			"total_disks_size": acc.TotalDisksSize,
-			"updated_by":       acc.UpdatedBy,
-			"updated_time":     acc.UpdatedTime,
-			"user_managed":     acc.UserManaged,
-			"vins_connected":   acc.VinsConnected,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountComputesListRead(d *schema.ResourceData, m interface{}) error {
-	accountComputesList, err := utilityAccountComputesListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountComputesList(accountComputesList))
-
-	return nil
-}
-
-func dataSourceAccountComputesListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"cpus": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"compute_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"compute_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"ram": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"registered": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"tech_status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"total_disks_size": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"user_managed": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"vins_connected": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceAccountComputesList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountComputesListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountComputesListSchemaMake(),
-	}
-}

decort/data_source_account_consumed_units.go

@@ -1,98 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceAccountConsumedUnitsRead(d *schema.ResourceData, m interface{}) error {
-	accountConsumedUnits, err := utilityAccountConsumedUnitsCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("cu_c", accountConsumedUnits.CUC)
-	d.Set("cu_d", accountConsumedUnits.CUD)
-	d.Set("cu_i", accountConsumedUnits.CUI)
-	d.Set("cu_m", accountConsumedUnits.CUM)
-	d.Set("cu_np", accountConsumedUnits.CUNP)
-	d.Set("gpu_units", accountConsumedUnits.GpuUnits)
-
-	return nil
-}
-
-func dataSourceAccountConsumedUnitsSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"cu_c": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"cu_d": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"cu_i": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"cu_m": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"cu_np": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"gpu_units": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-	}
-	return res
-}
-
-func dataSourceAccountConsumedUnits() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountConsumedUnitsRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountConsumedUnitsSchemaMake(),
-	}
-}

decort/data_source_account_consumed_units_by_type.go

@@ -1,78 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceAccountConsumedUnitsByTypeRead(d *schema.ResourceData, m interface{}) error {
-	result, err := utilityAccountConsumedUnitsByTypeCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("cu_result", result)
-
-	return nil
-}
-
-func dataSourceAccountConsumedUnitsByTypeSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"cu_type": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "cloud unit resource type",
-		},
-		"cu_result": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-	}
-	return res
-}
-
-func dataSourceAccountConsumedUnitsByType() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountConsumedUnitsByTypeRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountConsumedUnitsByTypeSchemaMake(),
-	}
-}

decort/data_source_account_deleted_list.go

@@ -1,58 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceAccountDeletedListRead(d *schema.ResourceData, m interface{}) error {
-	accountDeletedList, err := utilityAccountDeletedListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountList(accountDeletedList))
-
-	return nil
-}
-
-func dataSourceAccountDeletedList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountDeletedListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountListSchemaMake(),
-	}
-}

decort/data_source_account_disks_list.go

@@ -1,119 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenAccountDisksList(adl AccountDisksList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, ad := range adl {
-		temp := map[string]interface{}{
-			"disk_id":   ad.ID,
-			"disk_name": ad.Name,
-			"pool":      ad.Pool,
-			"sep_id":    ad.SepId,
-			"size_max":  ad.SizeMax,
-			"type":      ad.Type,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountDisksListRead(d *schema.ResourceData, m interface{}) error {
-	accountDisksList, err := utilityAccountDisksListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountDisksList(accountDisksList))
-
-	return nil
-}
-
-func dataSourceAccountDisksListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"disk_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"disk_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"pool": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"sep_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"size_max": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceAccountDisksList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountDisksListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountDisksListSchemaMake(),
-	}
-}

decort/data_source_account_flipgroups_list.go

@@ -1,194 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenAccountFlipGroupsList(afgl AccountFlipGroupsList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, afg := range afgl {
-		temp := map[string]interface{}{
-			"account_id":   afg.AccountId,
-			"client_type":  afg.ClientType,
-			"conn_type":    afg.ConnType,
-			"created_by":   afg.CreatedBy,
-			"created_time": afg.CreatedTime,
-			"default_gw":   afg.DefaultGW,
-			"deleted_by":   afg.DeletedBy,
-			"deleted_time": afg.DeletedTime,
-			"desc":         afg.Desc,
-			"gid":          afg.GID,
-			"guid":         afg.GUID,
-			"fg_id":        afg.ID,
-			"ip":           afg.IP,
-			"milestones":   afg.Milestones,
-			"fg_name":      afg.Name,
-			"net_id":       afg.NetID,
-			"net_type":     afg.NetType,
-			"netmask":      afg.NetMask,
-			"status":       afg.Status,
-			"updated_by":   afg.UpdatedBy,
-			"updated_time": afg.UpdatedTime,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountFlipGroupsListRead(d *schema.ResourceData, m interface{}) error {
-	accountFlipGroupsList, err := utilityAccountFlipGroupsListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountFlipGroupsList(accountFlipGroupsList))
-
-	return nil
-}
-
-func dataSourceAccountFlipGroupsListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"client_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"conn_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"default_gw": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"desc": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"gid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"fg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"ip": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"milestones": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"fg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"net_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"net_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"netmask": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceAccountFlipGroupsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountFlipGroupsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountFlipGroupsListSchemaMake(),
-	}
-}

decort/data_source_account_list.go

@@ -1,306 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenAccountList(al AccountCloudApiList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, acc := range al {
-		temp := map[string]interface{}{
-			"acl":          flattenRgAcl(acc.Acl),
-			"created_time": acc.CreatedTime,
-			"deleted_time": acc.DeletedTime,
-			"account_id":   acc.ID,
-			"account_name": acc.Name,
-			"status":       acc.Status,
-			"updated_time": acc.UpdatedTime,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-/*uncomment for cloudbroker
-func flattenAccountList(al AccountList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, acc := range al {
-		temp := map[string]interface{}{
-			"dc_location":        acc.DCLocation,
-			"ckey":               acc.CKey,
-			"meta":               flattenMeta(acc.Meta),
-
-			"acl": flattenRgAcl(acc.Acl),
-
-			"company":            acc.Company,
-			"companyurl":         acc.CompanyUrl,
-			"created_by":         acc.CreatedBy,
-
-			"created_time": acc.CreatedTime,
-
-			"deactivation_time":  acc.DeactiovationTime,
-			"deleted_by":         acc.DeletedBy,
-
-			"deleted_time": acc.DeletedTime,
-
-			"displayname":        acc.DisplayName,
-			"guid":               acc.GUID,
-
-			"account_id":   acc.ID,
-			"account_name": acc.Name,
-
-			"resource_limits":    flattenRgResourceLimits(acc.ResourceLimits),
-			"send_access_emails": acc.SendAccessEmails,
-			"service_account":    acc.ServiceAccount,
-
-			"status":       acc.Status,
-			"updated_time": acc.UpdatedTime,
-
-			"version":            acc.Version,
-			"vins":               acc.Vins,
-
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-*/
-
-func dataSourceAccountListRead(d *schema.ResourceData, m interface{}) error {
-	accountList, err := utilityAccountListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountList(accountList))
-
-	return nil
-}
-
-func dataSourceAccountListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					/*uncomment for cloudbroker
-					"dc_location": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"ckey": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"meta": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},*/
-					"acl": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"explicit": {
-									Type:     schema.TypeBool,
-									Computed: true,
-								},
-								"guid": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"right": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"status": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"type": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"user_group_id": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-							},
-						},
-					},
-					/*uncomment for cloudbroker
-					"company": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"companyurl": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					*/
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					/*uncomment for cloudbroker
-					"deactivation_time": {
-						Type:     schema.TypeFloat,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					*/
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					/*uncomment for cloudbroker
-					"displayname": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					*/
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					/*uncomment for cloudbroker
-					"resource_limits": {
-						Type:     schema.TypeList,
-						Computed: true,
-						MaxItems: 1,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"cu_c": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-								"cu_d": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-								"cu_i": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-								"cu_m": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-								"cu_np": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-								"gpu_units": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"send_access_emails": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"service_account": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					*/
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					/*uncomment for cloudbroker
-					"version": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"vins": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					*/
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceAccountList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountListSchemaMake(),
-	}
-}

decort/data_source_account_reserved_units.go

@@ -1,98 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceAccountReservedUnitsRead(d *schema.ResourceData, m interface{}) error {
-	accountReservedUnits, err := utilityAccountReservedUnitsCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("cu_c", accountReservedUnits.CUC)
-	d.Set("cu_d", accountReservedUnits.CUD)
-	d.Set("cu_i", accountReservedUnits.CUI)
-	d.Set("cu_m", accountReservedUnits.CUM)
-	d.Set("cu_np", accountReservedUnits.CUNP)
-	d.Set("gpu_units", accountReservedUnits.GpuUnits)
-
-	return nil
-}
-
-func dataSourceAccountReservedUnitsSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"cu_c": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"cu_d": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"cu_i": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"cu_m": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"cu_np": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"gpu_units": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-	}
-	return res
-}
-
-func dataSourceAccountReservedUnits() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountReservedUnitsRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountReservedUnitsSchemaMake(),
-	}
-}

decort/data_source_account_rg_list.go

@@ -1,294 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenAccountRGList(argl AccountRGList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, arg := range argl {
-		temp := map[string]interface{}{
-			"computes":     flattenAccRGComputes(arg.Computes),
-			"resources":    flattenAccRGResources(arg.Resources),
-			"created_by":   arg.CreatedBy,
-			"created_time": arg.CreatedTime,
-			"deleted_by":   arg.DeletedBy,
-			"deleted_time": arg.DeletedTime,
-			"rg_id":        arg.RGID,
-			"milestones":   arg.Milestones,
-			"rg_name":      arg.RGName,
-			"status":       arg.Status,
-			"updated_by":   arg.UpdatedBy,
-			"updated_time": arg.UpdatedTime,
-			"vinses":       arg.Vinses,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func flattenAccRGComputes(argc AccountRGComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"started": argc.Started,
-		"stopped": argc.Stopped,
-	}
-	res = append(res, temp)
-	return res
-}
-
-func flattenAccRGResources(argr AccountRGResources) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"consumed": flattenAccResource(argr.Consumed),
-		"limits":   flattenAccResource(argr.Limits),
-		"reserved": flattenAccResource(argr.Reserved),
-	}
-	res = append(res, temp)
-	return res
-}
-
-func dataSourceAccountRGListRead(d *schema.ResourceData, m interface{}) error {
-	accountRGList, err := utilityAccountRGListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountRGList(accountRGList))
-
-	return nil
-}
-
-func dataSourceAccountRGListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"computes": {
-						Type:     schema.TypeList,
-						MaxItems: 1,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"started": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"stopped": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"resources": {
-						Type:     schema.TypeList,
-						Computed: true,
-						MaxItems: 1,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"consumed": {
-									Type:     schema.TypeList,
-									Computed: true,
-									MaxItems: 1,
-									Elem: &schema.Resource{
-										Schema: map[string]*schema.Schema{
-											"cpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"disksize": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"extips": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"exttraffic": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"gpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"ram": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-										},
-									},
-								},
-
-								"limits": {
-									Type:     schema.TypeList,
-									Computed: true,
-									MaxItems: 1,
-									Elem: &schema.Resource{
-										Schema: map[string]*schema.Schema{
-											"cpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"disksize": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"extips": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"exttraffic": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"gpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"ram": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-										},
-									},
-								},
-								"reserved": {
-									Type:     schema.TypeList,
-									Computed: true,
-									MaxItems: 1,
-									Elem: &schema.Resource{
-										Schema: map[string]*schema.Schema{
-											"cpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"disksize": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"extips": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"exttraffic": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"gpu": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-											"ram": {
-												Type:     schema.TypeInt,
-												Computed: true,
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"milestones": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"vinses": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceAccountRGList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountRGListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountRGListSchemaMake(),
-	}
-}

decort/data_source_account_templates_list.go

@@ -1,139 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenAccountTemplatesList(atl AccountTemplatesList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, at := range atl {
-		temp := map[string]interface{}{
-			"unc_path":      at.UNCPath,
-			"account_id":    at.AccountId,
-			"desc":          at.Desc,
-			"template_id":   at.ID,
-			"template_name": at.Name,
-			"public":        at.Public,
-			"size":          at.Size,
-			"status":        at.Status,
-			"type":          at.Type,
-			"username":      at.Username,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountTemplatesListRead(d *schema.ResourceData, m interface{}) error {
-	accountTemplatesList, err := utilityAccountTemplatesListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountTemplatesList(accountTemplatesList))
-
-	return nil
-}
-
-func dataSourceAccountTemplatesListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"unc_path": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"desc": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"template_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"template_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"public": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"size": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"username": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceAccountTemplatessList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountTemplatesListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountTemplatesListSchemaMake(),
-	}
-}

decort/data_source_account_vins_list.go

@@ -1,174 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenAccountVinsList(avl AccountVinsList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, av := range avl {
-		temp := map[string]interface{}{
-			"account_id":     av.AccountId,
-			"account_name":   av.AccountName,
-			"computes":       av.Computes,
-			"created_by":     av.CreatedBy,
-			"created_time":   av.CreatedTime,
-			"deleted_by":     av.DeletedBy,
-			"deleted_time":   av.DeletedTime,
-			"external_ip":    av.ExternalIP,
-			"vin_id":         av.ID,
-			"vin_name":       av.Name,
-			"network":        av.Network,
-			"pri_vnf_dev_id": av.PriVnfDevId,
-			"rg_id":          av.RgId,
-			"rg_name":        av.RgName,
-			"status":         av.Status,
-			"updated_by":     av.UpdatedBy,
-			"updated_time":   av.UpdatedTime,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func dataSourceAccountVinsListRead(d *schema.ResourceData, m interface{}) error {
-	accountVinsList, err := utilityAccountVinsListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenAccountVinsList(accountVinsList))
-
-	return nil
-}
-
-func dataSourceAccountVinsListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the account",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "Search Result",
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"computes": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"external_ip": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"vin_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"vin_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"network": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"pri_vnf_dev_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceAccountVinsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceAccountVinsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceAccountVinsListSchemaMake(),
-	}
-}

decort/data_source_bservice.go

@@ -1,293 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceBasicServiceRead(d *schema.ResourceData, m interface{}) error {
-	bs, err := utilityBasicServiceCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("account_id", bs.AccountId)
-	d.Set("account_name", bs.AccountName)
-	d.Set("base_domain", bs.BaseDomain)
-	d.Set("computes", flattenBasicServiceComputes(bs.Computes))
-	d.Set("cpu_total", bs.CPUTotal)
-	d.Set("created_by", bs.CreatedBy)
-	d.Set("created_time", bs.CreatedTime)
-	d.Set("deleted_by", bs.DeletedBy)
-	d.Set("deleted_time", bs.DeletedTime)
-	d.Set("disk_total", bs.DiskTotal)
-	d.Set("gid", bs.GID)
-	d.Set("groups", bs.Groups)
-	d.Set("groups_name", bs.GroupsName)
-	d.Set("guid", bs.GUID)
-	d.Set("milestones", bs.Milestones)
-	d.Set("service_name", bs.Name)
-	d.Set("parent_srv_id", bs.ParentSrvId)
-	d.Set("parent_srv_type", bs.ParentSrvType)
-	d.Set("ram_total", bs.RamTotal)
-	d.Set("rg_id", bs.RGID)
-	d.Set("rg_name", bs.RGName)
-	d.Set("snapshots", flattenBasicServiceSnapshots(bs.Snapshots))
-	d.Set("ssh_key", bs.SSHKey)
-	d.Set("ssh_user", bs.SSHUser)
-	d.Set("status", bs.Status)
-	d.Set("tech_status", bs.TechStatus)
-	d.Set("updated_by", bs.UpdatedBy)
-	d.Set("updated_time", bs.UpdatedTime)
-	d.Set("user_managed", bs.UserManaged)
-	return nil
-}
-
-func flattenBasicServiceComputes(bscs BasicServiceComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, bsc := range bscs {
-		temp := map[string]interface{}{
-			"compgroup_id":   bsc.CompGroupId,
-			"compgroup_name": bsc.CompGroupName,
-			"compgroup_role": bsc.CompGroupRole,
-			"id":             bsc.ID,
-			"name":           bsc.Name,
-		}
-		res = append(res, temp)
-	}
-
-	return res
-}
-
-func flattenBasicServiceSnapshots(bsrvss BasicServiceSnapshots) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, bsrvs := range bsrvss {
-		temp := map[string]interface{}{
-			"guid":      bsrvs.GUID,
-			"label":     bsrvs.Label,
-			"timestamp": bsrvs.Timestamp,
-			"valid":     bsrvs.Valid,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourceBasicServiceSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"service_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"account_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"account_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"base_domain": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"computes": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"compgroup_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"compgroup_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"compgroup_role": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-
-		"cpu_total": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"disk_total": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"groups": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"groups_name": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"service_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"parent_srv_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"parent_srv_type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"ram_total": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"snapshots": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"guid": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"label": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"timestamp": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"valid": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-				},
-			},
-		},
-
-		"ssh_key": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"ssh_user": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"tech_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"user_managed": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-	}
-	return res
-}
-
-func dataSourceBasicService() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceBasicServiceRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceBasicServiceSchemaMake(),
-	}
-}

decort/data_source_bservice_deleted_list.go

@@ -1,58 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceBasicServiceDeletedListRead(d *schema.ResourceData, m interface{}) error {
-	basicServiceDeletedList, err := utilityBasicServiceDeletedListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenBasicServiceList(basicServiceDeletedList))
-
-	return nil
-}
-
-func dataSourceBasicServiceDeletedList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceBasicServiceDeletedListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceBasicServiceListSchemaMake(),
-	}
-}

decort/data_source_bservice_group.go

@@ -1,291 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceBasicServiceGroupRead(d *schema.ResourceData, m interface{}) error {
-	bsg, err := utilityBasicServiceGroupCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("account_id", bsg.AccountId)
-	d.Set("account_name", bsg.AccountName)
-	d.Set("computes", flattenBSGroupComputes(bsg.Computes))
-	d.Set("consistency", bsg.Consistency)
-	d.Set("cpu", bsg.CPU)
-	d.Set("created_by", bsg.CreatedBy)
-	d.Set("created_time", bsg.CreatedTime)
-	d.Set("deleted_by", bsg.DeletedBy)
-	d.Set("deleted_time", bsg.DeletedTime)
-	d.Set("disk", bsg.Disk)
-	d.Set("driver", bsg.Driver)
-	d.Set("extnets", bsg.Extnets)
-	d.Set("gid", bsg.GID)
-	d.Set("guid", bsg.GUID)
-	d.Set("image_id", bsg.ImageId)
-	d.Set("milestones", bsg.Milestones)
-	d.Set("compgroup_name", bsg.Name)
-	d.Set("parents", bsg.Parents)
-	d.Set("ram", bsg.RAM)
-	d.Set("rg_id", bsg.RGID)
-	d.Set("rg_name", bsg.RGName)
-	d.Set("role", bsg.Role)
-	d.Set("sep_id", bsg.SepId)
-	d.Set("seq_no", bsg.SeqNo)
-	d.Set("status", bsg.Status)
-	d.Set("tech_status", bsg.TechStatus)
-	d.Set("timeout_start", bsg.TimeoutStart)
-	d.Set("updated_by", bsg.UpdatedBy)
-	d.Set("updated_time", bsg.UpdatedTime)
-	d.Set("vinses", bsg.Vinses)
-	return nil
-}
-
-func flattenBSGroupOSUsers(bsgosus BasicServiceGroupOSUsers) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, bsgosu := range bsgosus {
-		temp := map[string]interface{}{
-			"login":    bsgosu.Login,
-			"password": bsgosu.Password,
-		}
-		res = append(res, temp)
-	}
-
-	return res
-}
-
-func flattenBSGroupComputes(bsgcs BasicServiceGroupComputes) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, bsgc := range bsgcs {
-		temp := map[string]interface{}{
-			"id":           bsgc.ID,
-			"ip_addresses": bsgc.IPAdresses,
-			"name":         bsgc.Name,
-			"os_users":     flattenBSGroupOSUsers(bsgc.OSUsers),
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourceBasicServiceGroupSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"service_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"compgroup_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"account_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"account_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"computes": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"ip_addresses": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"os_users": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"login": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"password": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"consistency": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"cpu": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"disk": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"driver": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"extnets": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"image_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"compgroup_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"parents": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"ram": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"role": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"sep_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"seq_no": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"tech_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"timeout_start": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"updated_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"vinses": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceBasicServiceGroup() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceBasicServiceGroupRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceBasicServiceGroupSchemaMake(),
-	}
-}

decort/data_source_bservice_list.go

@@ -1,215 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenBasicServiceList(bsl BasicServiceList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, bs := range bsl {
-		temp := map[string]interface{}{
-			"account_id":      bs.AccountId,
-			"account_name":    bs.AccountName,
-			"base_domain":     bs.BaseDomain,
-			"created_by":      bs.CreatedBy,
-			"created_time":    bs.CreatedTime,
-			"deleted_by":      bs.DeletedBy,
-			"deleted_time":    bs.DeletedTime,
-			"gid":             bs.GID,
-			"groups":          bs.Groups,
-			"guid":            bs.GUID,
-			"service_id":      bs.ID,
-			"service_name":    bs.Name,
-			"parent_srv_id":   bs.ParentSrvId,
-			"parent_srv_type": bs.ParentSrvType,
-			"rg_id":           bs.RGID,
-			"rg_name":         bs.RGName,
-			"ssh_user":        bs.SSHUser,
-			"status":          bs.Status,
-			"tech_status":     bs.TechStatus,
-			"updated_by":      bs.UpdatedBy,
-			"updated_time":    bs.UpdatedTime,
-			"user_managed":    bs.UserManaged,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourceBasicServiceListRead(d *schema.ResourceData, m interface{}) error {
-	basicServiceList, err := utilityBasicServiceListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenBasicServiceList(basicServiceList))
-
-	return nil
-}
-
-func dataSourceBasicServiceListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "ID of the account to query for BasicService instances",
-		},
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "ID of the resource group to query for BasicService instances",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"base_domain": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"gid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"groups": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"guid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"service_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"service_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"parent_srv_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"parent_srv_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"ssh_user": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"tech_status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"user_managed": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceBasicServiceList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceBasicServiceListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceBasicServiceListSchemaMake(),
-	}
-}

decort/data_source_bservice_snapshot_list.go

@@ -1,93 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceBasicServiceSnapshotListRead(d *schema.ResourceData, m interface{}) error {
-	basicServiceSnapshotList, err := utilityBasicServiceSnapshotListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenBasicServiceSnapshots(basicServiceSnapshotList))
-
-	return nil
-}
-
-func dataSourceBasicServiceSnapshotListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"service_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the BasicService instance",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"guid": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"label": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"timestamp": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"valid": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceBasicServiceSnapshotList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceBasicServiceSnapshotListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceBasicServiceSnapshotListSchemaMake(),
-	}
-}

decort/data_source_compute.go

@@ -26,7 +26,6 @@ package decort
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	// "net/url"
@@ -67,6 +66,60 @@ func parseComputeDisksToExtraDisks(disks []DiskRecord) []interface{} {
 	return result
 }
 
+// NOTE: this is a legacy function, which is not used as of rc-1.10
+// Use "parseComputeDisksToExtraDisks" instead
+func parseComputeDisks(disks []DiskRecord) []interface{} {
+	// Return value was designed to d.Set("disks",) item of dataSourceCompute schema
+	// However, this item was excluded from the schema as it is not directly
+	// managed through Terraform
+	length := len(disks)
+	log.Debugf("parseComputeDisks: called for %d disks", length)
+
+	/*
+		if length == 1 && disks[0].Type == "B" {
+			// there is only one disk in the list and it is a boot disk
+			// as we skip boot disks, the result will be of 0 lenght
+			length = 0
+		}
+	*/
+
+	result := []interface{}{}
+
+	if length == 0 {
+		return result
+	}
+
+	for _, value := range disks {
+		/*
+			if value.Type == "B" {
+				// skip boot disk when parsing the list of disks
+				continue
+			}
+		*/
+		elem := make(map[string]interface{})
+		// keys in this map should correspond to the Schema definition
+		// as returned by dataSourceDiskSchemaMake()
+		elem["name"] = value.Name
+		elem["disk_id"] = value.ID
+		elem["account_id"] = value.AccountID
+		elem["account_name"] = value.AccountName
+		elem["description"] = value.Desc
+		elem["image_id"] = value.ImageID
+		elem["size"] = value.SizeMax
+		elem["type"] = value.Type
+		elem["sep_id"] = value.SepID
+		elem["sep_type"] = value.SepType
+		elem["pool"] = value.Pool
+		// elem["status"] = value.Status
+		// elem["tech_status"] = value.TechStatus
+		elem["compute_id"] = value.ComputeID
+
+		result = append(result, elem)
+	}
+
+	return result
+}
+
 func parseBootDiskSize(disks []DiskRecord) int {
 	// this return value will be used to d.Set("boot_disk_size",) item of dataSourceCompute schema
 	if len(disks) == 0 {
@@ -97,16 +150,6 @@ func parseBootDiskId(disks []DiskRecord) uint {
 	return 0
 }
 
-func findBootDisk(disks []DiskRecord) (*DiskRecord, error) {
-	for _, d := range disks {
-		if d.Type == "B" {
-			return &d, nil
-		}
-	}
-
-	return nil, errors.New("boot disk not found")
-}
-
 // Parse the list of interfaces from compute/get response into a list of networks
 // attached to this compute
 func parseComputeInterfacesToNetworks(ifaces []InterfaceRecord) []interface{} {
@@ -133,6 +176,71 @@ func parseComputeInterfacesToNetworks(ifaces []InterfaceRecord) []interface{} {
 	return result
 }
 
+/*
+func parseComputeInterfacesToNetworks(ifaces []InterfaceRecord) []map[string]interface{} {
+	// return value will be used to d.Set("network") item of dataSourceCompute schema
+	length := len(ifaces)
+	log.Debugf("parseComputeInterfacesToNetworks: called for %d ifaces", length)
+
+	result := make([]map[string]interface{}, length, length)
+
+	for i, value := range ifaces {
+		elem := make(map[string]interface{})
+		// Keys in this map should correspond to the Schema definition
+		// as returned by networkSubresourceSchemaMake()
+		elem["net_id"] = value.NetID
+		elem["net_type"] = value.NetType
+		elem["ip_address"] = value.IPAddress
+		elem["mac"] = value.MAC
+
+		// log.Debugf("   element %d: net_id=%d, net_type=%s", i, value.NetID, value.NetType)
+
+		result[i] = elem
+	}
+
+	return result
+}
+*/
+
+// NOTE: this function is retained for historical purposes and actually not used as of rc-1.10
+func parseComputeInterfaces(ifaces []InterfaceRecord) []map[string]interface{} {
+	// return value was designed to d.Set("interfaces",) item of dataSourceCompute schema
+	// However, this item was excluded from the schema as it is not directly
+	// managed through Terraform
+	length := len(ifaces)
+	log.Debugf("parseComputeInterfaces: called for %d ifaces", length)
+
+	result := make([]map[string]interface{}, length, length)
+
+	for i, value := range ifaces {
+		// Keys in this map should correspond to the Schema definition
+		// as returned by dataSourceInterfaceSchemaMake()
+		elem := make(map[string]interface{})
+
+		elem["net_id"] = value.NetID
+		elem["net_type"] = value.NetType
+		elem["ip_address"] = value.IPAddress
+		elem["netmask"] = value.NetMask
+		elem["mac"] = value.MAC
+		elem["default_gw"] = value.DefaultGW
+		elem["name"] = value.Name
+		elem["connection_id"] = value.ConnID
+		elem["connection_type"] = value.ConnType
+
+		/* TODO: add code to parse QoS
+		qos_schema := interfaceQosSubresourceSchemaMake()
+		qos_schema.Set("egress_rate", value.QOS.ERate)
+		qos_schema.Set("ingress_rate", value.QOS.InRate)
+		qos_schema.Set("ingress_burst", value.QOS.InBurst)
+		elem["qos"] = qos_schema
+		*/
+
+		result[i] = elem
+	}
+
+	return result
+}
+
 func flattenCompute(d *schema.ResourceData, compFacts string) error {
 	// This function expects that compFacts string contains response from API compute/get,
 	// i.e. detailed information about compute instance.
@@ -159,6 +267,8 @@ func flattenCompute(d *schema.ResourceData, compFacts string) error {
 	d.Set("cpu", model.Cpu)
 	d.Set("ram", model.Ram)
 	// d.Set("boot_disk_size", model.BootDiskSize) - bootdiskSize key in API compute/get is always zero, so we set boot_disk_size in another way
+	d.Set("boot_disk_size", parseBootDiskSize(model.Disks))
+	d.Set("boot_disk_id", parseBootDiskId(model.Disks)) // we may need boot disk ID in resize operations
 	d.Set("image_id", model.ImageID)
 	d.Set("description", model.Desc)
 	d.Set("cloud_init", "applied") // NOTE: for existing compute we hard-code this value as an indicator for DiffSuppress fucntion
@@ -171,16 +281,6 @@ func flattenCompute(d *schema.ResourceData, compFacts string) error {
 		d.Set("started", false)
 	}
 
-	bootDisk, err := findBootDisk(model.Disks)
-	if err != nil {
-		return err
-	}
-
-	d.Set("boot_disk_size", bootDisk.SizeMax)
-	d.Set("boot_disk_id", bootDisk.ID) // we may need boot disk ID in resize operations
-	d.Set("sep_id", bootDisk.SepID)
-	d.Set("pool", bootDisk.Pool)
-
 	if len(model.Disks) > 0 {
 		log.Debugf("flattenCompute: calling parseComputeDisksToExtraDisks for %d disks", len(model.Disks))
 		if err = d.Set("extra_disks", parseComputeDisksToExtraDisks(model.Disks)); err != nil {
@@ -340,6 +440,17 @@ func dataSourceCompute() *schema.Resource {
 				Description: "Network connection(s) for this compute.",
 			},
 
+			/*
+				"interfaces": {
+					Type:     schema.TypeList,
+					Computed: true,
+					Elem: &schema.Resource{
+						Schema: interfaceSubresourceSchemaMake(),
+					},
+					Description: "Specification for the virtual NICs configured on this compute instance.",
+				},
+			*/
+
 			"os_users": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -367,6 +478,26 @@ func dataSourceCompute() *schema.Resource {
 				Default:     true,
 				Description: "Is compute started.",
 			},
+
+			/*
+				"status": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "Current model status of this compute instance.",
+				},
+
+				"tech_status": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "Current technical status of this compute instance.",
+				},
+
+				"internal_ip": {
+					Type:          schema.TypeString,
+					Computed:      true,
+					Description:  "Internal IP address of this Compute.",
+				},
+			*/
 		},
 	}
 }

decort/data_source_disk_list.go

@@ -1,391 +0,0 @@
-/*
-Copyright (c) 2019-2021 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Sergey Shubin, <sergey.shubin@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenDiskList(dl DisksListResp) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, disk := range dl {
-		diskAcl, _ := json.Marshal(disk.Acl)
-		diskIotune, _ := json.Marshal(disk.IOTune)
-		temp := map[string]interface{}{
-			"account_id":            disk.AccountID,
-			"account_name":          disk.AccountName,
-			"acl":                   string(diskAcl),
-			"boot_partition":        disk.BootPartition,
-			"compute_id":            disk.ComputeID,
-			"compute_name":          disk.ComputeName,
-			"created_time":          disk.CreatedTime,
-			"deleted_time":          disk.DeletedTime,
-			"desc":                  disk.Desc,
-			"destruction_time":      disk.DestructionTime,
-			"devicename":            disk.DeviceName,
-			"disk_path":             disk.DiskPath,
-			"gid":                   disk.GridID,
-			"guid":                  disk.GUID,
-			"disk_id":               disk.ID,
-			"image_id":              disk.ImageID,
-			"images":                disk.Images,
-			"iotune":                string(diskIotune),
-			"iqn":                   disk.IQN,
-			"login":                 disk.Login,
-			"machine_id":            disk.MachineId,
-			"machine_name":          disk.MachineName,
-			"milestones":            disk.Milestones,
-			"name":                  disk.Name,
-			"order":                 disk.Order,
-			"params":                disk.Params,
-			"parent_id":             disk.ParentId,
-			"passwd":                disk.Passwd,
-			"pci_slot":              disk.PciSlot,
-			"pool":                  disk.Pool,
-			"purge_attempts":        disk.PurgeAttempts,
-			"purge_time":            disk.PurgeTime,
-			"reality_device_number": disk.RealityDeviceNumber,
-			"reference_id":          disk.ReferenceId,
-			"res_id":                disk.ResID,
-			"res_name":              disk.ResName,
-			"role":                  disk.Role,
-			"sep_id":                disk.SepID,
-			"sep_type":              disk.SepType,
-			"size_max":              disk.SizeMax,
-			"size_used":             disk.SizeUsed,
-			"snapshots":             flattendDiskSnapshotList(disk.Snapshots),
-			"status":                disk.Status,
-			"tech_status":           disk.TechStatus,
-			"type":                  disk.Type,
-			"vmid":                  disk.VMID,
-			"update_by":             disk.UpdateBy,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func flattendDiskSnapshotList(sl SnapshotRecordList) []interface{} {
-	res := make([]interface{}, 0)
-	for _, snapshot := range sl {
-		temp := map[string]interface{}{
-			"guid":          snapshot.Guid,
-			"label":         snapshot.Label,
-			"res_id":        snapshot.ResId,
-			"snap_set_guid": snapshot.SnapSetGuid,
-			"snap_set_time": snapshot.SnapSetTime,
-			"timestamp":     snapshot.TimeStamp,
-		}
-		res = append(res, temp)
-	}
-
-	return res
-
-}
-
-func dataSourceDiskListRead(d *schema.ResourceData, m interface{}) error {
-	diskList, err := utilityDiskListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenDiskList(diskList))
-
-	return nil
-}
-
-func dataSourceDiskListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "ID of the account the disks belong to",
-		},
-		"type": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "type of the disks",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"acl": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"boot_partition": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"compute_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"compute_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"desc": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"destruction_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"devicename": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"disk_path": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"gid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"disk_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"image_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"images": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
-					"iotune": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"iqn": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"login": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"machine_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"machine_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"milestones": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"order": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"params": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"parent_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"passwd": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"pci_slot": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"pool": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"purge_attempts": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"purge_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"reality_device_number": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"reference_id": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"res_id": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"res_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"role": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"sep_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"sep_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"size_max": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"size_used": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"snapshots": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"guid": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"label": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"res_id": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"snap_set_guid": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"snap_set_time": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"timestamp": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"tech_status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"vmid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"update_by": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceDiskList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceDiskListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceDiskListSchemaMake(),
-	}
-}

decort/data_source_extnet.go

@@ -1,321 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceExtnetRead(d *schema.ResourceData, m interface{}) error {
-	e, err := utilityExtnetCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("ckey", e.CKey)
-	d.Set("meta", flattenMeta(e.Meta))
-	d.Set("check__ips", e.CheckIPs)
-	d.Set("check_ips", e.CheckIps)
-	d.Set("default", e.Default)
-	d.Set("default_qos", flattenExtnetDefaultQos(e.DefaultQos))
-	d.Set("desc", e.Desc)
-	d.Set("dns", e.Dns)
-	d.Set("excluded", e.Excluded)
-	d.Set("free_ips", e.FreeIps)
-	d.Set("gateway", e.Gateway)
-	d.Set("gid", e.GID)
-	d.Set("guid", e.GUID)
-	d.Set("ipcidr", e.IPCidr)
-	d.Set("milestones", e.Milestones)
-	d.Set("net_name", e.Name)
-	d.Set("network", e.Network)
-	d.Set("network_id", e.NetworkId)
-	d.Set("pre_reservations_num", e.PreReservationsNum)
-	d.Set("prefix", e.Prefix)
-	d.Set("pri_vnf_dev_id", e.PriVnfDevId)
-	d.Set("reservations", flattenExtnetReservations(e.Reservations))
-	d.Set("shared_with", e.SharedWith)
-	d.Set("status", e.Status)
-	d.Set("vlan_id", e.VlanID)
-	d.Set("vnfs", flattenExtnetVNFS(e.VNFS))
-	return nil
-}
-
-func flattenExtnetReservations(ers ExtnetReservations) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, er := range ers {
-		temp := map[string]interface{}{
-			"client_type": er.ClientType,
-			"domainname":  er.DomainName,
-			"hostname":    er.HostName,
-			"desc":        er.Desc,
-			"ip":          er.IP,
-			"mac":         er.MAC,
-			"type":        er.Type,
-			"vm_id":       er.VMID,
-		}
-		res = append(res, temp)
-	}
-
-	return res
-}
-
-func flattenExtnetDefaultQos(edqos ExtnetQos) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"e_rate":   edqos.ERate,
-		"guid":     edqos.GUID,
-		"in_burst": edqos.InBurst,
-		"in_rate":  edqos.InRate,
-	}
-	res = append(res, temp)
-	return res
-}
-
-func flattenExtnetVNFS(evnfs ExtnetVNFS) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"dhcp": evnfs.DHCP,
-	}
-	res = append(res, temp)
-	return res
-}
-
-func dataSourceExtnetSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"net_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-			Description: "meta",
-		},
-		"check__ips": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"check_ips": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"default": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"default_qos": {
-			Type:     schema.TypeList,
-			MaxItems: 1,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"e_rate": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"in_burst": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"in_rate": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"desc": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"dns": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"excluded": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"free_ips": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"gateway": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"ipcidr": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"net_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"network": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"network_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"pre_reservations_num": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"prefix": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"pri_vnf_dev_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"reservations": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"client_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"domainname": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"hostname": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"desc": {
-						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,
-					},
-				},
-			},
-		},
-		"shared_with": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"vlan_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"vnfs": {
-			Type:     schema.TypeList,
-			MaxItems: 1,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"dhcp": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceExtnet() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceExtnetRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceExtnetSchemaMake(),
-	}
-}

decort/data_source_extnet_computes_list.go

@@ -1,156 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenExtnetsComputes(ecs ExtnetExtendList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, ec := range ecs {
-		temp := map[string]interface{}{
-			"net_id": ec.ID,
-			"ipaddr": ec.IPAddr,
-			"ipcidr": ec.IPCidr,
-			"name":   ec.Name,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func flattenExtnetComputesList(ecl ExtnetComputesList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, ec := range ecl {
-		temp := map[string]interface{}{
-			"account_id":   ec.AccountId,
-			"account_name": ec.AccountName,
-			"extnets":      flattenExtnetsComputes(ec.Extnets),
-			"id":           ec.ID,
-			"name":         ec.Name,
-			"rg_id":        ec.RGID,
-			"rg_name":      ec.RGName,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourceExtnetComputesListRead(d *schema.ResourceData, m interface{}) error {
-	extnetComputesList, err := utilityExtnetComputesListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenExtnetComputesList(extnetComputesList))
-
-	return nil
-}
-
-func dataSourceExtnetComputesListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "filter by account ID",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"extnets": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"net_id": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"ipaddr": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"ipcidr": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"name": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceExtnetComputesList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceExtnetComputesListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceExtnetComputesListSchemaMake(),
-	}
-}

decort/data_source_extnet_default.go

@@ -1,74 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"strconv"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceExtnetDefaultRead(d *schema.ResourceData, m interface{}) error {
-	extnetId, err := utilityExtnetDefaultCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	extnetIdInt, err := strconv.ParseInt(extnetId, 10, 32)
-	if err != nil {
-		return err
-	}
-	d.Set("net_id", extnetIdInt)
-
-	return nil
-}
-
-func dataSourceExtnetDefaultSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"net_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-	return res
-}
-
-func dataSourceExtnetDefault() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceExtnetDefaultRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceExtnetDefaultSchemaMake(),
-	}
-}

decort/data_source_extnet_list.go

@@ -1,112 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenExtnetList(el ExtnetList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, e := range el {
-		temp := map[string]interface{}{
-			"net_id": e.ID,
-			"ipcidr": e.IPCidr,
-			"name":   e.Name,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourceExtnetListRead(d *schema.ResourceData, m interface{}) error {
-	extnetList, err := utilityExtnetListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenExtnetList(extnetList))
-
-	return nil
-}
-
-func dataSourceExtnetListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"account_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "filter by account ID",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"net_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"ipcidr": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceExtnetList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceExtnetListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceExtnetListSchemaMake(),
-	}
-}

decort/data_source_grid.go

@@ -37,6 +37,7 @@ func flattenGrid(d *schema.ResourceData, grid *Grid) {
 	d.Set("guid", grid.Guid)
 	d.Set("location_code", grid.LocationCode)
 	d.Set("id", grid.Id)
+	return
 }
 
 func dataSourceGridRead(d *schema.ResourceData, m interface{}) error {

decort/data_source_image.go

@@ -69,6 +69,7 @@ func flattenImage(d *schema.ResourceData, image *Image) {
 	d.Set("meta", flattenMeta(image.Meta))
 	d.Set("desc", image.Desc)
 	d.Set("shared_with", image.SharedWith)
+	return
 }
 
 func dataSourceImageRead(d *schema.ResourceData, m interface{}) error {

decort/data_source_image_list_stacks.go

@@ -29,7 +29,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
-func flattenImageListStacks(_ *schema.ResourceData, stack ImageListStacks) []map[string]interface{} {
+func flattenImageListStacks(d *schema.ResourceData, stack ImageListStacks) []map[string]interface{} {
 	temp := make([]map[string]interface{}, 0)
 	for _, item := range stack {
 		t := map[string]interface{}{

decort/data_source_pcidevice.go

@@ -1,128 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"strconv"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourcePcideviceRead(d *schema.ResourceData, m interface{}) error {
-	pcidevice, err := utilityPcideviceCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	d.Set("ckey", pcidevice.CKey)
-	d.Set("meta", flattenMeta(pcidevice.Meta))
-	d.Set("compute_id", pcidevice.Computeid)
-	d.Set("description", pcidevice.Description)
-	d.Set("guid", pcidevice.Guid)
-	d.Set("hw_path", pcidevice.HwPath)
-	d.Set("rg_id", pcidevice.RgID)
-	d.Set("name", pcidevice.Name)
-	d.Set("stack_id", pcidevice.StackID)
-	d.Set("status", pcidevice.Status)
-	d.Set("system_name", pcidevice.SystemName)
-
-	d.SetId(strconv.Itoa(d.Get("device_id").(int)))
-
-	return nil
-}
-
-func dataSourcePcideviceSchemaMake() map[string]*schema.Schema {
-	rets := map[string]*schema.Schema{
-		"device_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-			ForceNew: true,
-		},
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"compute_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"description": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"hw_path": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"rg_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"stack_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"system_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-	}
-
-	return rets
-}
-
-func dataSourcePcidevice() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourcePcideviceRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourcePcideviceSchemaMake(),
-	}
-}

decort/data_source_pcidevice_list.go

@@ -1,152 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenPcideviceList(pl PcideviceList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, item := range pl {
-		temp := map[string]interface{}{
-			"ckey":        item.CKey,
-			"meta":        flattenMeta(item.Meta),
-			"compute_id":  item.Computeid,
-			"description": item.Description,
-			"guid":        item.Guid,
-			"hw_path":     item.HwPath,
-			"device_id":   item.ID,
-			"rg_id":       item.RgID,
-			"name":        item.Name,
-			"stack_id":    item.StackID,
-			"status":      item.Status,
-			"system_name": item.SystemName,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourcePcideviceListRead(d *schema.ResourceData, m interface{}) error {
-	pcideviceList, err := utilityPcideviceListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	d.Set("items", flattenPcideviceList(pcideviceList))
-
-	id := uuid.New()
-	d.SetId(id.String())
-
-	return nil
-}
-
-func dataSourcePcideviceItem() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"compute_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"description": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"hw_path": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"device_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"rg_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"stack_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"system_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-	}
-}
-
-func dataSourcePcideviceListSchemaMake() map[string]*schema.Schema {
-	rets := map[string]*schema.Schema{
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "pcidevice list",
-			Elem: &schema.Resource{
-				Schema: dataSourcePcideviceItem(),
-			},
-		},
-	}
-
-	return rets
-}
-
-func dataSourcePcideviceList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourcePcideviceListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourcePcideviceListSchemaMake(),
-	}
-}

decort/data_source_rg_list.go

@@ -1,314 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenRgList(rgl ResgroupListResp) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, rg := range rgl {
-		temp := map[string]interface{}{
-			"account_id":        rg.AccountID,
-			"account_name":      rg.AccountName,
-			"acl":               flattenRgAcl(rg.ACLs),
-			"created_by":        rg.CreatedBy,
-			"created_time":      rg.CreatedTime,
-			"def_net_id":        rg.DefaultNetID,
-			"def_net_type":      rg.DefaultNetType,
-			"deleted_by":        rg.DeletedBy,
-			"deleted_time":      rg.DeletedTime,
-			"desc":              rg.Decsription,
-			"gid":               rg.GridID,
-			"guid":              rg.GUID,
-			"rg_id":             rg.ID,
-			"lock_status":       rg.LockStatus,
-			"milestones":        rg.Milestones,
-			"name":              rg.Name,
-			"register_computes": rg.RegisterComputes,
-			"resource_limits":   flattenRgResourceLimits(rg.ResourceLimits),
-			"secret":            rg.Secret,
-			"status":            rg.Status,
-			"updated_by":        rg.UpdatedBy,
-			"updated_time":      rg.UpdatedTime,
-			"vins":              rg.Vins,
-			"vms":               rg.Computes,
-		}
-		res = append(res, temp)
-	}
-	return res
-
-}
-
-func flattenRgAcl(rgAcls []AccountAclRecord) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, rgAcl := range rgAcls {
-		temp := map[string]interface{}{
-			"explicit":      rgAcl.IsExplicit,
-			"guid":          rgAcl.Guid,
-			"right":         rgAcl.Rights,
-			"status":        rgAcl.Status,
-			"type":          rgAcl.Type,
-			"user_group_id": rgAcl.UgroupID,
-		}
-		res = append(res, temp)
-	}
-	return res
-}
-
-func flattenRgResourceLimits(rl ResourceLimits) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"cu_c":      rl.CUC,
-		"cu_d":      rl.CUD,
-		"cu_i":      rl.CUI,
-		"cu_m":      rl.CUM,
-		"cu_np":     rl.CUNP,
-		"gpu_units": rl.GpuUnits,
-	}
-	res = append(res, temp)
-
-	return res
-
-}
-
-func dataSourceRgListRead(d *schema.ResourceData, m interface{}) error {
-	rgList, err := utilityRgListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenRgList(rgList))
-
-	return nil
-}
-
-func dataSourceRgListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"includedeleted": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "included deleted resource groups",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"acl": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"explicit": {
-									Type:     schema.TypeBool,
-									Computed: true,
-								},
-								"guid": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"right": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"status": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"type": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"user_group_id": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"def_net_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"def_net_type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"desc": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"gid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"lock_status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"milestones": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"register_computes": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"resource_limits": {
-						Type:     schema.TypeList,
-						Computed: true,
-						MaxItems: 1,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"cu_c": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-								"cu_d": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-								"cu_i": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-								"cu_m": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-								"cu_np": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-								"gpu_units": {
-									Type:     schema.TypeFloat,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"secret": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"vins": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-					"vms": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeInt,
-						},
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceRgList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceRgListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceRgListSchemaMake(),
-	}
-}

decort/data_source_sep.go

@@ -1,145 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceSepRead(d *schema.ResourceData, m interface{}) error {
-	desSep, err := utilitySepCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-	id := uuid.New()
-	d.SetId(id.String())
-
-	d.Set("ckey", desSep.Ckey)
-	d.Set("meta", flattenMeta(desSep.Meta))
-	d.Set("consumed_by", desSep.ConsumedBy)
-	d.Set("desc", desSep.Desc)
-	d.Set("gid", desSep.Gid)
-	d.Set("guid", desSep.Guid)
-	d.Set("sep_id", desSep.Id)
-	d.Set("milestones", desSep.Milestones)
-	d.Set("name", desSep.Name)
-	d.Set("obj_status", desSep.ObjStatus)
-	d.Set("provided_by", desSep.ProvidedBy)
-	d.Set("tech_status", desSep.TechStatus)
-	d.Set("type", desSep.Type)
-	data, _ := json.Marshal(desSep.Config)
-	d.Set("config", string(data))
-
-	return nil
-}
-
-func dataSourceSepCSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"sep_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "sep type des id",
-		},
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"consumed_by": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"desc": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"obj_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"provided_by": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"tech_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"config": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-	}
-}
-
-func dataSourceSep() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceSepRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceSepCSchemaMake(),
-	}
-}

decort/data_source_sep_config.go

@@ -1,77 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceSepConfigRead(d *schema.ResourceData, m interface{}) error {
-	sepConfig, err := utilitySepConfigCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-
-	data, _ := json.Marshal(sepConfig)
-	d.Set("config", string(data))
-
-	return nil
-}
-
-func dataSourceSepConfigSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"sep_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "storage endpoint provider ID",
-		},
-		"config": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "sep config json string",
-		},
-	}
-}
-
-func dataSourceSepConfig() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceSepConfigRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceSepConfigSchemaMake(),
-	}
-}

decort/data_source_sep_consumption.go

@@ -1,195 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceSepConsumptionRead(d *schema.ResourceData, m interface{}) error {
-	sepCons, err := utilitySepConsumptionCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-	id := uuid.New()
-	d.SetId(id.String())
-
-	d.Set("type", sepCons.Type)
-	d.Set("total", flattenSepConsumption(sepCons.Total))
-	d.Set("by_pool", flattenSepConsumptionPools(sepCons.ByPool))
-
-	return nil
-}
-
-func flattenSepConsumptionPools(mp map[string]SepConsumptionInd) []map[string]interface{} {
-	sh := make([]map[string]interface{}, 0)
-	for k, v := range mp {
-		temp := map[string]interface{}{
-			"name":           k,
-			"disk_count":     v.DiskCount,
-			"disk_usage":     v.DiskUsage,
-			"snapshot_count": v.SnapshotCount,
-			"snapshot_usage": v.SnapshotUsage,
-			"usage":          v.Usage,
-			"usage_limit":    v.UsageLimit,
-		}
-		sh = append(sh, temp)
-	}
-	return sh
-}
-
-func flattenSepConsumption(sc SepConsumptionTotal) []map[string]interface{} {
-	sh := make([]map[string]interface{}, 0)
-	temp := map[string]interface{}{
-		"capacity_limit": sc.CapacityLimit,
-		"disk_count":     sc.DiskCount,
-		"disk_usage":     sc.DiskUsage,
-		"snapshot_count": sc.SnapshotCount,
-		"snapshot_usage": sc.SnapshotUsage,
-		"usage":          sc.Usage,
-		"usage_limit":    sc.UsageLimit,
-	}
-	sh = append(sh, temp)
-	return sh
-}
-
-func dataSourceSepConsumptionSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"sep_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "sep id",
-		},
-		"by_pool": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"name": {
-						Type:        schema.TypeString,
-						Computed:    true,
-						Description: "pool name",
-					},
-					"disk_count": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "number of disks",
-					},
-					"disk_usage": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "disk usage",
-					},
-					"snapshot_count": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "number of snapshots",
-					},
-					"snapshot_usage": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "snapshot usage",
-					},
-					"usage": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "usage",
-					},
-					"usage_limit": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "usage limit",
-					},
-				},
-			},
-			Description: "consumption divided by pool",
-		},
-		"total": {
-			Type:     schema.TypeList,
-			Computed: true,
-			MaxItems: 1,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"capacity_limit": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"disk_count": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "number of disks",
-					},
-					"disk_usage": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "disk usage",
-					},
-					"snapshot_count": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "number of snapshots",
-					},
-					"snapshot_usage": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "snapshot usage",
-					},
-					"usage": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "usage",
-					},
-					"usage_limit": {
-						Type:        schema.TypeInt,
-						Computed:    true,
-						Description: "usage limit",
-					},
-				},
-			},
-			Description: "total consumption",
-		},
-		"type": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "sep type",
-		},
-	}
-}
-
-func dataSourceSepConsumption() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceSepConsumptionRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceSepConsumptionSchemaMake(),
-	}
-}

decort/data_source_sep_disk_list.go

@@ -1,82 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceSepDiskListRead(d *schema.ResourceData, m interface{}) error {
-	sepDiskList, err := utilitySepDiskListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", sepDiskList)
-
-	return nil
-}
-
-func dataSourceSepDiskListSchemaMake() map[string]*schema.Schema {
-	rets := map[string]*schema.Schema{
-		"sep_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "storage endpoint provider ID",
-		},
-		"pool_name": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "pool name",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "sep disk list",
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-	}
-
-	return rets
-}
-
-func dataSourceSepDiskList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceSepDiskListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceSepDiskListSchemaMake(),
-	}
-}

decort/data_source_sep_list.go

@@ -1,180 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenSepList(sl SepList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, item := range sl {
-		data, _ := json.Marshal(item.Config)
-		temp := map[string]interface{}{
-			"ckey":        item.Ckey,
-			"meta":        flattenMeta(item.Meta),
-			"consumed_by": item.ConsumedBy,
-			"desc":        item.Desc,
-			"gid":         item.Gid,
-			"guid":        item.Guid,
-			"sep_id":      item.Id,
-			"milestones":  item.Milestones,
-			"name":        item.Name,
-			"obj_status":  item.ObjStatus,
-			"provided_by": item.ProvidedBy,
-			"tech_status": item.TechStatus,
-			"type":        item.Type,
-			"config":      string(data),
-		}
-
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourceSepListRead(d *schema.ResourceData, m interface{}) error {
-	sepList, err := utilitySepListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenSepList(sepList))
-
-	return nil
-}
-
-func dataSourceSepListSchemaMake() map[string]*schema.Schema {
-	rets := map[string]*schema.Schema{
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "page size",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "sep list",
-			Elem: &schema.Resource{
-				Schema: dataSourceSepShortSchemaMake(),
-			},
-		},
-	}
-
-	return rets
-}
-
-func dataSourceSepShortSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"consumed_by": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"desc": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"sep_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"obj_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"provided_by": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"tech_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"config": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-	}
-}
-
-func dataSourceSepList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceSepListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceSepListSchemaMake(),
-	}
-}

decort/data_source_sep_pool.go

@@ -1,80 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceSepPoolRead(d *schema.ResourceData, m interface{}) error {
-	sepPool, err := utilitySepPoolCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-	id := uuid.New()
-	d.SetId(id.String())
-
-	data, _ := json.Marshal(sepPool)
-	d.Set("pool", string(data))
-
-	return nil
-}
-
-func dataSourceSepPoolSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"sep_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "storage endpoint provider ID",
-		},
-		"pool_name": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "pool name",
-		},
-		"pool": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-	}
-}
-
-func dataSourceSepPool() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceSepPoolRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceSepPoolSchemaMake(),
-	}
-}

decort/data_source_snapshot_list.go

@@ -1,120 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenSnapshotList(gl SnapshotList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, item := range gl {
-		temp := map[string]interface{}{
-			"label":     item.Label,
-			"guid":      item.Guid,
-			"disks":     item.Disks,
-			"timestamp": item.Timestamp,
-		}
-
-		res = append(res, temp)
-	}
-	return res
-}
-
-func dataSourceSnapshotListRead(d *schema.ResourceData, m interface{}) error {
-	snapshotList, err := utilitySnapshotListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenSnapshotList(snapshotList))
-
-	return nil
-}
-
-func dataSourceSnapshotListSchemaMake() map[string]*schema.Schema {
-	rets := map[string]*schema.Schema{
-		"compute_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			ForceNew:    true,
-			Description: "ID of the compute instance to create snapshot for.",
-		},
-		"items": {
-			Type:        schema.TypeList,
-			Computed:    true,
-			Description: "snapshot list",
-			Elem: &schema.Resource{
-				Schema: dataSourceSnapshotSchemaMake(),
-			},
-		},
-	}
-
-	return rets
-}
-
-func dataSourceSnapshotSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"label": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "text label for snapshot. Must be unique among this compute snapshots.",
-		},
-		"disks": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"guid": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "guid of the snapshot",
-		},
-		"timestamp": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "timestamp",
-		},
-	}
-}
-
-func dataSourceSnapshotList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceSnapshotListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceSnapshotListSchemaMake(),
-	}
-}

decort/data_source_vgpu.go

@@ -1,111 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Petr Krutov, <petr.krutov@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"strconv"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func dataSourceVGPURead(d *schema.ResourceData, m interface{}) error {
-	vgpu, err := utilityVGPUCheckPresence(d, m)
-	if vgpu == nil {
-		d.SetId("")
-		return err
-	}
-
-	d.SetId(strconv.Itoa(vgpu.ID))
-	d.Set("vgpu_id", vgpu.ID)
-	d.Set("account_id", vgpu.AccountID)
-	d.Set("mode", vgpu.Mode)
-	d.Set("pgpu", vgpu.PgpuID)
-	d.Set("profile_id", vgpu.ProfileID)
-	d.Set("ram", vgpu.RAM)
-	d.Set("status", vgpu.Status)
-	d.Set("type", vgpu.Type)
-	d.Set("vm_id", vgpu.VmID)
-
-	return nil
-}
-
-func dataSourceVGPUSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"vgpu_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-
-		"account_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-
-		"mode": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-
-		"pgpu": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-
-		"profile_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-
-		"ram": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-
-		"type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-
-		"vm_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-}
-
-func dataSourceVGPU() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceVGPURead,
-
-		Schema: dataSourceVGPUSchemaMake(),
-	}
-}

decort/data_source_vins.go

@@ -48,13 +48,13 @@ func flattenVins(d *schema.ResourceData, vins_facts string) error {
 	}
 
 	log.Debugf("flattenVins: decoded ViNS name:ID %s:%d, account ID %d, RG ID %d",
-		vinsRecord.Name, vinsRecord.ID, vinsRecord.AccountID, vinsRecord.RgID)
+	vinsRecord.Name, vinsRecord.ID, vinsRecord.AccountID, vinsRecord.RgID)
 
 	d.SetId(fmt.Sprintf("%d", vinsRecord.ID))
 	d.Set("name", vinsRecord.Name)
 	d.Set("account_id", vinsRecord.AccountID)
 	d.Set("account_name", vinsRecord.AccountName)
-	d.Set("rg_id", vinsRecord.RgID)
+	err = d.Set("rg_id", vinsRecord.RgID)
 	d.Set("description", vinsRecord.Desc)
 	d.Set("ipcidr", vinsRecord.IPCidr)
 
@@ -117,11 +117,11 @@ func dataSourceVins() *schema.Resource {
 			},
 
 			/*
-				"vins_id": {
-					Type:        schema.TypeInt,
-					Optional:    true,
-					Description: "Unique ID of the ViNS. If ViNS ID is specified, then ViNS name, rg_id and account_id are ignored.",
-				},
+			"vins_id": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "Unique ID of the ViNS. If ViNS ID is specified, then ViNS name, rg_id and account_id are ignored.",
+			},
 			*/
 
 			"rg_id": {

decort/data_source_vins_list.go

@@ -1,178 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func flattenVinsList(vl VinsList) []map[string]interface{} {
-	res := make([]map[string]interface{}, 0)
-	for _, v := range vl {
-		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,
-			"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 dataSourceVinsListRead(d *schema.ResourceData, m interface{}) error {
-	vinsList, err := utilityVinsListCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(id.String())
-	d.Set("items", flattenVinsList(vinsList))
-
-	return nil
-}
-
-func dataSourceVinsListSchemaMake() map[string]*schema.Schema {
-	res := map[string]*schema.Schema{
-		"include_deleted": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "include deleted computes",
-		},
-		"page": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page number",
-		},
-		"size": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Description: "Page size",
-		},
-		"items": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"account_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"account_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"created_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"deleted_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"deleted_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"external_ip": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"vins_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"vins_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"network": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"rg_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"rg_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_by": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"updated_time": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"vxlan_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-	}
-	return res
-}
-
-func dataSourceVinsList() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Read: dataSourceVinsListRead,
-
-		Timeouts: &schema.ResourceTimeout{
-			Read:    &Timeout30s,
-			Default: &Timeout60s,
-		},
-
-		Schema: dataSourceVinsListSchemaMake(),
-	}
-}

decort/disk_subresource.go

@@ -0,0 +1,86 @@
+/*
+Copyright (c) 2019-2021 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Author: Sergey Shubin, <sergey.shubin@digitalenergy.online>, <svs1370@gmail.com>
+
+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.
+*/
+
+package decort
+
+import (
+	// log "github.com/sirupsen/logrus"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
+)
+
+
+// ID, type,  name, size, account ID, SEP ID, SEP type, pool, status, tech status, compute ID, image ID
+func diskSubresourceSchemaMake() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"name": {
+			Type:        schema.TypeString,
+			Required:    true,
+			Description: "Name of this disk.",
+		},
+
+		"size": {
+			Type:         schema.TypeInt,
+			Required:     true,
+			ValidateFunc: validation.IntAtLeast(1),
+			Description:  "Size of the disk in GB.",
+		},
+
+		"account_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			ValidateFunc: validation.IntAtLeast(1),
+			Description: "ID of the account this disk belongs to.",
+		},
+
+		"type": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Type of this disk.",
+		},
+
+		"sep_id": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Default:     "default",
+			Description: "ID of the storage end-point provider serving this disk.",
+		},
+
+		"sep_type": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Default:     "default",
+			Description: "Type of the storage provider serving this disk.",
+		},
+
+		"pool": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Default:     "default",
+			Description: "Pool on the storage where this disk is located.",
+		},
+
+		"image_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "ID of the binary Image this disk resource is cloned from (if any).",
+		},
+	}
+
+	return rets
+}

decort/interface_subresource.go

@@ -0,0 +1,331 @@
+/*
+Copyright (c) 2019-2021 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Author: Sergey Shubin, <sergey.shubin@digitalenergy.online>, <svs1370@gmail.com>
+
+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.
+*/
+
+/*
+ This file contains definitions and code for handling Interface component of Compute schema
+*/
+
+package decort
+
+import (
+	/*
+		"log"
+		"strconv"
+		"strings"
+	*/
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	// "github.com/hashicorp/terraform-plugin-sdk/helper/validation"
+)
+
+func interfaceSubresourceSchemaMake() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"net_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "ID of the network entity this interface is connected to.",
+		},
+
+		"net_type": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Type of the network entity this interface is connected to.",
+		},
+
+		"ip_address": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "IP addresses assigned to this interface.",
+		},
+
+		"netmask": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Network mask to be used with this interface.",
+		},
+
+		"mac": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "MAC address of this interface.",
+		},
+
+		"default_gw": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Default gateway associated with this interface.",
+		},
+
+		"name": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Interface name.",
+		},
+
+		"connection_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "VxLAN or VLAN ID this interface is connected to.",
+		},
+
+		"connection_type": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Type of the segment (VLAN or VxLAN) this interface is connected to.",
+		},
+
+		"qos": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Elem: &schema.Resource{
+				Schema: interfaceQosSubresourceSchemaMake(),
+			},
+			Description: "QoS settings for this interface.",
+		},
+	}
+
+	return rets
+}
+
+func interfaceQosSubresourceSchemaMake() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"egress_rate": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Egress rate limit on this interface.",
+		},
+
+		"ingress_burst": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Ingress burst limit on this interface.",
+		},
+
+		"ingress_rate": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Ingress rate limit on this interface.",
+		},
+
+		"guid": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "GUID of this QoS record.",
+		},
+	}
+
+	return rets
+}
+
+/*
+func flattenNetworks(nets []NicRecord) []interface{} {
+	// this function expects an array of NicRecord as returned by machines/get API call
+	// NOTE: it does NOT expect a strucutre as returned by externalnetwork/list
+	var length = 0
+	var strarray []string
+
+	for _, value := range nets {
+		if value.NicType == "PUBLIC" {
+			length += 1
+		}
+	}
+	log.Debugf("flattenNetworks: found %d NICs with PUBLIC type", length)
+
+	result := make([]interface{}, length)
+	if length == 0 {
+		return result
+	}
+
+	elem := make(map[string]interface{})
+
+	var subindex = 0
+	for index, value := range nets {
+		if value.NicType == "PUBLIC" {
+			// this will be changed as network segments entity
+			// value.Params for ext net comes in a form "gateway:176.118.165.1 externalnetworkId:6"
+			// for network_id we need to extract from this string
+			strarray = strings.Split(value.Params, " ")
+			substr := strings.Split(strarray[1], ":")
+			elem["network_id"], _ = strconv.Atoi(substr[1])
+			elem["ip_range"] = value.IPAddress
+			// elem["label"] = ... - should be uncommented for the future release
+			log.Debugf("flattenNetworks: parsed element %d - network_id %d, ip_range %s",
+				index, elem["network_id"].(int), value.IPAddress)
+			result[subindex] = elem
+			subindex += 1
+		}
+	}
+
+	return result
+}
+
+func makePortforwardsConfig(arg_list []interface{}) (pfws []PortforwardConfig, count int) {
+	count = len(arg_list)
+	if count < 1 {
+		return nil, 0
+	}
+
+	pfws = make([]PortforwardConfig, count)
+	var subres_data map[string]interface{}
+	for index, value := range arg_list {
+		subres_data = value.(map[string]interface{})
+		// pfws[index].Label = subres_data["label"].(string) - should be uncommented for future release
+		pfws[index].ExtPort = subres_data["ext_port"].(int)
+		pfws[index].IntPort = subres_data["int_port"].(int)
+		pfws[index].Proto = subres_data["proto"].(string)
+	}
+
+	return pfws, count
+}
+
+func flattenPortforwards(pfws []PortforwardRecord) []interface{} {
+	result := make([]interface{}, len(pfws))
+	elem := make(map[string]interface{})
+	var port_num int
+
+	for index, value := range pfws {
+		// elem["label"] = ... - should be uncommented for the future release
+
+		// external port field is of TypeInt in the portforwardSubresourceSchema, but string is returned
+		// by portforwards/list API, so we need conversion here
+		port_num, _ = strconv.Atoi(value.ExtPort)
+		elem["ext_port"] = port_num
+		// internal port field is of TypeInt in the portforwardSubresourceSchema, but string is returned
+		// by portforwards/list API, so we need conversion here
+		port_num, _ = strconv.Atoi(value.IntPort)
+		elem["int_port"] = port_num
+		elem["proto"] = value.Proto
+		elem["ext_ip"] = value.ExtIP
+		elem["int_ip"] = value.IntIP
+		result[index] = elem
+	}
+
+	return result
+}
+
+func portforwardSubresourceSchema() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"label": {
+			Type:        schema.TypeString,
+			Required:    true,
+			Description: "Unique label of this network connection to identify it amnong other connections for this VM.",
+		},
+
+		"ext_port": {
+			Type:         schema.TypeInt,
+			Required:     true,
+			ValidateFunc: validation.IntBetween(1, 65535),
+			Description:  "External port number for this port forwarding rule.",
+		},
+
+		"int_port": {
+			Type:         schema.TypeInt,
+			Required:     true,
+			ValidateFunc: validation.IntBetween(1, 65535),
+			Description:  "Internal port number for this port forwarding rule.",
+		},
+
+		"proto": {
+			Type:     schema.TypeString,
+			Required: true,
+			// ValidateFunc: validation.IntBetween(1, ),
+			Description: "Protocol type for this port forwarding rule. Should be either 'tcp' or 'udp'.",
+		},
+
+		"ext_ip": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: ".",
+		},
+
+		"int_ip": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: ".",
+		},
+	}
+
+	return rets
+}
+
+func flattenNICs(nics []NicRecord) []interface{} {
+	var result = make([]interface{}, len(nics))
+	elem := make(map[string]interface{})
+
+	for index, value := range nics {
+		elem["status"] = value.Status
+		elem["type"] = value.NicType
+		elem["mac"] = value.MacAddress
+		elem["ip_address"] = value.IPAddress
+		elem["parameters"] = value.Params
+		elem["reference_id"] = value.ReferenceID
+		elem["network_id"] = value.NetworkID
+		result[index] = elem
+	}
+
+	return result
+}
+
+func nicSubresourceSchema() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"status": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Current status of this NIC.",
+		},
+
+		"type": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Type of this NIC.",
+		},
+
+		"mac": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "MAC address assigned to this NIC.",
+		},
+
+		"ip_address": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "IP address assigned to this NIC.",
+		},
+
+		"parameters": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Additional NIC parameters.",
+		},
+
+		"reference_id": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "Reference ID of this NIC.",
+		},
+
+		"network_id": {
+			Type:        schema.TypeInt,
+			Computed:    true,
+			Description: "Network ID which this NIC is connected to.",
+		},
+	}
+
+	return rets
+}
+
+*/

decort/models_api.go

@@ -36,7 +36,7 @@ import (
 var Timeout30s = time.Second * 30
 var Timeout60s = time.Second * 60
 var Timeout180s = time.Second * 180
-var Timeout20m = time.Minute * 20
+var Timeout10m = time.Minute * 10
 
 //
 // structures related to /cloudapi/rg/list API
@@ -51,49 +51,33 @@ type UserAclRecord struct {
 }
 
 type AccountAclRecord struct {
-	IsExplicit   bool   `json:"explicit"`
-	Guid         string `json:"guid"`
-	Rights       string `json:"right"`
-	Status       string `json:"status"`
-	Type         string `json:"type"`
-	UgroupID     string `json:"userGroupId"`
-	CanBeDeleted bool   `json:"canBeDeleted"`
-}
-
-type ResourceLimits struct {
-	CUC      float64 `json:"CU_C"`
-	CUD      float64 `json:"CU_D"`
-	CUI      float64 `json:"CU_I"`
-	CUM      float64 `json:"CU_M"`
-	CUNP     float64 `json:"CU_NP"`
-	GpuUnits float64 `json:"gpu_units"`
+	IsExplicit bool   `json:"explicit"`
+	Guid       string `json:"guid"`
+	Rights     string `json:"right"`
+	Status     string `json:"status"`
+	Type       string `json:"type"`
+	UgroupID   string `json:"userGroupId"`
 }
 
 type ResgroupRecord struct {
-	ACLs             []AccountAclRecord `json:"acl"`
-	AccountID        int                `json:"accountId"`
-	AccountName      string             `json:"accountName"`
-	CreatedBy        string             `json:"createdBy"`
-	CreatedTime      uint64             `json:"createdTime"`
-	DefaultNetID     int                `json:"def_net_id"`
-	DefaultNetType   string             `json:"def_net_type"`
-	DeletedBy        string             `json:"deletedBy"`
-	DeletedTime      int                `json:"deletedTime"`
-	Decsription      string             `json:"desc"`
-	GridID           int                `json:"gid"`
-	GUID             int                `json:"guid"`
-	ID               uint               `json:"id"`
-	LockStatus       string             `json:"lockStatus"`
-	Milestones       int                `json:"milestones"`
-	Name             string             `json:"name"`
-	RegisterComputes bool               `json:"registerComputes"`
-	ResourceLimits   ResourceLimits     `json:"resourceLimits"`
-	Secret           string             `json:"secret"`
-	Status           string             `json:"status"`
-	UpdatedBy        string             `json:"updatedBy"`
-	UpdatedTime      uint64             `json:"updatedTime"`
-	Vins             []int              `json:"vins"`
-	Computes         []int              `json:"vms"`
+	ACLs           []UserAclRecord  `json:"acl"`
+	Owner          AccountAclRecord `json:"accountAcl"`
+	AccountID      int              `json:"accountId"`
+	AccountName    string           `json:"accountName"`
+	CreatedBy      string           `json:"createdBy"`
+	CreatedTime    uint64           `json:"createdTime"`
+	DefaultNetID   int              `json:"def_net_id"`
+	DefaultNetType string           `json:"def_net_type"`
+	Decsription    string           `json:"desc"`
+	GridID         int              `json:"gid"`
+	ID             uint             `json:"id"`
+	LockStatus     string           `json:"lockStatus"`
+	Name           string           `json:"name"`
+	Status         string           `json:"status"`
+	UpdatedBy      string           `json:"updatedBy"`
+	UpdatedTime    uint64           `json:"updatedTime"`
+	Vins           []int            `json:"vins"`
+	Computes       []int            `json:"vms"`
 }
 
 const ResgroupListAPI = "/restmachine/cloudapi/rg/list"
@@ -314,62 +298,46 @@ const ComputeResizeAPI = "/restmachine/cloudapi/compute/resize"
 type SnapshotRecord struct {
 	Guid        string `json:"guid"`
 	Label       string `json:"label"`
-	ResId       string `json:"resId"`
 	SnapSetGuid string `json:"snapSetGuid"`
 	SnapSetTime uint64 `json:"snapSetTime"`
 	TimeStamp   uint64 `json:"timestamp"`
 }
 
-type SnapshotRecordList []SnapshotRecord
-
 type DiskRecord struct {
-	Acl                 map[string]interface{} `json:"acl"`
-	AccountID           int                    `json:"accountId"`
-	AccountName         string                 `json:"accountName"`
-	BootPartition       int                    `json:"bootPartition"`
-	CreatedTime         uint64                 `json:"creationTime"`
-	ComputeID           int                    `json:"computeId"`
-	ComputeName         string                 `json:"computeName"`
-	DeletedTime         uint64                 `json:"deletionTime"`
-	DeviceName          string                 `json:"devicename"`
-	Desc                string                 `json:"desc"`
-	DestructionTime     uint64                 `json:"destructionTime"`
-	DiskPath            string                 `json:"diskPath"`
-	GridID              int                    `json:"gid"`
-	GUID                int                    `json:"guid"`
-	ID                  uint                   `json:"id"`
-	ImageID             int                    `json:"imageId"`
-	Images              []int                  `json:"images"`
-	IOTune              map[string]interface{} `json:"iotune"`
-	IQN                 string                 `json:"iqn"`
-	Login               string                 `json:"login"`
-	Name                string                 `json:"name"`
-	MachineId           int                    `json:"machineId"`
-	MachineName         string                 `json:"machineName"`
-	Milestones          uint64                 `json:"milestones"`
-	Order               int                    `json:"order"`
-	Params              string                 `json:"params"`
-	Passwd              string                 `json:"passwd"`
-	ParentId            int                    `json:"parentId"`
-	PciSlot             int                    `json:"pciSlot"`
-	Pool                string                 `json:"pool"`
-	PurgeTime           uint64                 `json:"purgeTime"`
-	PurgeAttempts       uint64                 `json:"purgeAttempts"`
-	RealityDeviceNumber int                    `json:"realityDeviceNumber"`
-	ReferenceId         string                 `json:"referenceId"`
-	ResID               string                 `json:"resId"`
-	ResName             string                 `json:"resName"`
-	Role                string                 `json:"role"`
-	SepType             string                 `json:"sepType"`
-	SepID               int                    `json:"sepId"` // NOTE: absent from compute/get output
-	SizeMax             int                    `json:"sizeMax"`
-	SizeUsed            int                    `json:"sizeUsed"` // sum over all snapshots of this disk to report total consumed space
-	Snapshots           []SnapshotRecord       `json:"snapshots"`
-	Status              string                 `json:"status"`
-	TechStatus          string                 `json:"techStatus"`
-	Type                string                 `json:"type"`
-	UpdateBy            uint64                 `json:"updateBy"`
-	VMID                int                    `json:"vmid"`
+	// ACLs `json:"ACL"` - it is a dictionary, special parsing required
+	// was - Acl map[string]string  `json:"acl"`
+	AccountID       int    `json:"accountId"`
+	AccountName     string `json:"accountName"` // NOTE: absent from compute/get output
+	BootPartition   int    `json:"bootPartition"`
+	CreatedTime     uint64 `json:"creationTime"`
+	DeletedTime     uint64 `json:"deletionTime"`
+	Desc            string `json:"desc"`
+	DestructionTime uint64 `json:"destructionTime"`
+	DiskPath        string `json:"diskPath"`
+	GridID          int    `json:"gid"`
+	ID              uint   `json:"id"`
+	ImageID         int    `json:"imageId"`
+	Images          []int  `json:"images"`
+	// IOTune 'json:"iotune" - it is a dictionary
+	Name string `json:"name"`
+	// Order                   `json:"order"`
+	ParentId int `json:"parentId"`
+	PciSlot  int `json:"pciSlot"`
+	// ResID string           `json:"resId"`
+	// ResName string         `json:"resName"`
+	// Params string          `json:"params"`
+	Pool      string `json:"pool"`
+	PurgeTime uint64 `json:"purgeTime"`
+	// Role string            `json:"role"`
+	SepType    string           `json:"sepType"`
+	SepID      int              `json:"sepId"` // NOTE: absent from compute/get output
+	SizeMax    int              `json:"sizeMax"`
+	SizeUsed   int              `json:"sizeUsed"` // sum over all snapshots of this disk to report total consumed space
+	Snapshots  []SnapshotRecord `json:"snapshots"`
+	Status     string           `json:"status"`
+	TechStatus string           `json:"techStatus"`
+	Type       string           `json:"type"`
+	ComputeID  int              `json:"vmid"`
 }
 
 type OsUserRecord struct {
@@ -534,7 +502,6 @@ const DisksCreateAPI = "/restmachine/cloudapi/disks/create"
 const DisksGetAPI = "/restmachine/cloudapi/disks/get" // Returns single DiskRecord on success
 
 const DisksListAPI = "/restmachine/cloudapi/disks/list" // Returns list of DiskRecord on success
-
 type DisksListResp []DiskRecord
 
 //
@@ -638,27 +605,11 @@ type K8sRecord struct {
 		Masters K8sNodeRecord   `json:"masters"`
 		Workers []K8sNodeRecord `json:"workers"`
 	} `json:"k8sGroups"`
-	LbID   int    `json:"lbId"`
 	Name   string `json:"name"`
 	RgID   int    `json:"rgId"`
 	RgName string `json:"rgName"`
 }
 
-//LbRecord represents load balancer instance
-type LbRecord struct {
-	ID          int    `json:"id"`
-	Name        string `json:"name"`
-	RgID        int    `json:"rgId"`
-	VinsID      int    `json:"vinsId"`
-	ExtNetID    int    `json:"extnetId"`
-	PrimaryNode struct {
-		BackendIP  string `json:"backendIp"`
-		ComputeID  int    `json:"computeId"`
-		FrontendIP string `json:"frontendIp"`
-		NetworkID  int    `json:"networkId"`
-	} `json:"primaryNode"`
-}
-
 const K8sCreateAPI = "/restmachine/cloudapi/k8s/create"
 const K8sGetAPI = "/restmachine/cloudapi/k8s/get"
 const K8sUpdateAPI = "/restmachine/cloudapi/k8s/update"
@@ -672,8 +623,6 @@ const K8sWorkerDeleteAPI = "/restmachine/cloudapi/k8s/deleteWorkerFromGroup"
 
 const K8sGetConfigAPI = "/restmachine/cloudapi/k8s/getConfig"
 
-const LbGetAPI = "/restmachine/cloudapi/lb/get"
-
 //Blasphemous workaround for parsing Result value
 type TaskResult int
 
@@ -850,637 +799,3 @@ type Grid struct {
 }
 
 type GridList []Grid
-
-/////////////////////
-/// SNAPSHOT API  ///
-/////////////////////
-
-const snapshotCreateAPI = "/restmachine/cloudapi/compute/snapshotCreate"
-const snapshotDeleteAPI = "/restmachine/cloudapi/compute/snapshotDelete"
-const snapshotRollbackAPI = "/restmachine/cloudapi/compute/snapshotRollback"
-const snapshotListAPI = "/restmachine/cloudapi/compute/snapshotList"
-
-type Snapshot struct {
-	Disks     []int  `json:"disks"`
-	Guid      string `json:"guid"`
-	Label     string `json:"label"`
-	Timestamp uint64 `json:"timestamp"`
-}
-
-type SnapshotList []Snapshot
-
-////////////////
-/// VGPU API ///
-////////////////
-
-const vgpuListAPI = "/restmachine/cloudbroker/vgpu/list"
-
-type VGPU struct {
-	AccountID int    `json:"accountId"`
-	ID        int    `json:"id"`
-	Mode      string `json:"mode"`
-	PgpuID    int    `json:"pgpuid"`
-	ProfileID int    `json:"profileId"`
-	RAM       int    `json:"ram"`
-	Status    string `json:"status"`
-	Type      string `json:"type"`
-	VmID      int    `json:"vmid"`
-}
-
-/////////////////////////////
-//       PCIDEVICE         //
-/////////////////////////////
-
-const pcideviceListAPI = "/restmachine/cloudbroker/pcidevice/list"
-const pcideviceDisableAPI = "/restmachine/cloudbroker/pcidevice/disable"
-const pcideviceEnableAPI = "/restmachine/cloudbroker/pcidevice/enable"
-const pcideviceCreateAPI = "/restmachine/cloudbroker/pcidevice/create"
-const pcideviceDeleteAPI = "/restmachine/cloudbroker/pcidevice/delete"
-
-type Pcidevice struct {
-	CKey        string        `json:"_ckey"`
-	Meta        []interface{} `json:"_meta"`
-	Computeid   int           `json:"computeId"`
-	Description string        `json:"description"`
-	Guid        int           `json:"guid"`
-	HwPath      string        `json:"hwPath"`
-	ID          int           `json:"id"`
-	Name        string        `json:"name"`
-	RgID        int           `json:"rgId"`
-	StackID     int           `json:"stackId"`
-	Status      string        `json:"status"`
-	SystemName  string        `json:"systemName"`
-}
-
-type PcideviceList []Pcidevice
-
-///////////////////
-///// SEP API /////
-///////////////////
-const sepAddConsumerNodesAPI = "/restmachine/cloudbroker/sep/addConsumerNodes"
-const sepDelConsumerNodesAPI = "/restmachine/cloudbroker/sep/delConsumerNodes"
-const sepAddProviderNodesAPI = "/restmachine/cloudbroker/sep/addProviderNodes"
-
-const sepConfigFieldEditAPI = "/restmachine/cloudbroker/sep/configFieldEdit"
-const sepConfigInsertAPI = "/restmachine/cloudbroker/sep/configInsert"
-const sepConfigValidateAPI = "/restmachine/cloudbroker/sep/configValidate"
-
-const sepConsumptionAPI = "/restmachine/cloudbroker/sep/consumption"
-
-const sepDecommissionAPI = "/restmachine/cloudbroker/sep/decommission"
-
-const sepEnableAPI = "/restmachine/cloudbroker/sep/enable"
-const sepDisableAPI = "/restmachine/cloudbroker/sep/disable"
-
-const sepDiskListAPI = "/restmachine/cloudbroker/sep/diskList"
-
-const sepGetAPI = "/restmachine/cloudbroker/sep/get"
-const sepGetConfigAPI = "/restmachine/cloudbroker/sep/getConfig"
-const sepGetPoolAPI = "/restmachine/cloudbroker/sep/getPool"
-
-const sepCreateAPI = "/restmachine/cloudbroker/sep/create"
-const sepDeleteAPI = "/restmachine/cloudbroker/sep/delete"
-const sepListAPI = "/restmachine/cloudbroker/sep/list"
-
-const sepUpdateCapacityLimitAPI = "/restmachine/cloudbroker/sep/updateCapacityLimit"
-
-///Sep Models
-type SepConsumptionInd struct {
-	DiskCount     int `json:"disk_count"`
-	DiskUsage     int `json:"disk_usage"`
-	SnapshotCount int `json:"snapshot_count"`
-	SnapshotUsage int `json:"snapshot_usage"`
-	Usage         int `json:"usage"`
-	UsageLimit    int `json:"usage_limit"`
-}
-
-type SepConsumptionTotal struct {
-	CapacityLimit int `json:"capacity_limit"`
-	SepConsumptionInd
-}
-
-type SepConsumption struct {
-	Total  SepConsumptionTotal          `json:"total"`
-	Type   string                       `json:"type"`
-	ByPool map[string]SepConsumptionInd `json:"byPool"`
-}
-
-type SepDiskList []int
-
-type Sep struct {
-	Ckey       string        `json:"_ckey"`
-	Meta       []interface{} `json:"_meta"`
-	ConsumedBy []int         `json:"consumedBy"`
-	Desc       string        `json:"desc"`
-	Gid        int           `json:"gid"`
-	Guid       int           `json:"guid"`
-	Id         int           `json:"id"`
-	Milestones int           `json:"milestones"`
-	Name       string        `json:"name"`
-	ObjStatus  string        `json:"objStatus"`
-	ProvidedBy []int         `json:"providedBy"`
-	TechStatus string        `json:"techStatus"`
-	Type       string        `json:"type"`
-	Config     SepConfig     `json:"config"`
-}
-
-type SepConfig map[string]interface{}
-
-type SepList []Sep
-type SepPool map[string]interface{}
-
-///////////////////////
-/////  ACCOUNTS    ////
-///////////////////////
-
-const accountAddUserAPI = "/restmachine/cloudapi/account/addUser"
-const accountAuditsAPI = "/restmachine/cloudapi/account/audits"
-const accountCreateAPI = "/restmachine/cloudapi/account/create"
-const accountDeleteAPI = "/restmachine/cloudapi/account/delete"
-const accountDeleteUserAPI = "/restmachine/cloudapi/account/deleteUser"
-const accountDisableAPI = "/restmachine/cloudapi/account/disable"
-const accountEnableAPI = "/restmachine/cloudapi/account/enable"
-const accountGetAPI = "/restmachine/cloudapi/account/get"
-const accountGetConsumedUnitsAPI = "/restmachine/cloudapi/account/getConsumedAccountUnits"
-const accountGetConsumedUnitsByTypeAPI = "/restmachine/cloudapi/account/getConsumedCloudUnitsByType"
-const accountGetReservedUnitsAPI = "/restmachine/cloudapi/account/getReservedAccountUnits"
-const accountListAPI = "/restmachine/cloudapi/account/list"
-const accountListComputesAPI = "/restmachine/cloudapi/account/listComputes"
-const accountListDeletedAPI = "/restmachine/cloudapi/account/listDeleted"
-const accountListDisksAPI = "/restmachine/cloudapi/account/listDisks"
-const accountListFlipGroupsAPI = "/restmachine/cloudapi/account/listFlipGroups"
-const accountListRGAPI = "/restmachine/cloudapi/account/listRG"
-const accountListTemplatesAPI = "/restmachine/cloudapi/account/listTemplates"
-const accountListVinsAPI = "/restmachine/cloudapi/account/listVins"
-const accountRestoreAPI = "/restmachine/cloudapi/account/restore"
-const accountUpdateAPI = "/restmachine/cloudapi/account/update"
-const accountUpdateUserAPI = "/restmachine/cloudapi/account/updateUser"
-
-////Structs
-
-type Account struct {
-	DCLocation        string             `json:"DCLocation"`
-	CKey              string             `jspn:"_ckey"`
-	Meta              []interface{}      `json:"_meta"`
-	Acl               []AccountAclRecord `json:"acl"`
-	Company           string             `json:"company"`
-	CompanyUrl        string             `json:"companyurl"`
-	CreatedBy         string             `jspn:"createdBy"`
-	CreatedTime       int                `json:"createdTime"`
-	DeactiovationTime float64            `json:"deactivationTime"`
-	DeletedBy         string             `json:"deletedBy"`
-	DeletedTime       int                `json:"deletedTime"`
-	DisplayName       string             `json:"displayname"`
-	GUID              int                `json:"guid"`
-	ID                int                `json:"id"`
-	Name              string             `json:"name"`
-	ResourceLimits    ResourceLimits     `json:"resourceLimits"`
-	SendAccessEmails  bool               `json:"sendAccessEmails"`
-	ServiceAccount    bool               `json:"serviceAccount"`
-	Status            string             `json:"status"`
-	UpdatedTime       int                `json:"updatedTime"`
-	Version           int                `json:"version"`
-	Vins              []int              `json:"vins"`
-}
-
-type AccountList []Account
-
-type AccountCloudApi struct {
-	Acl         []AccountAclRecord `json:"acl"`
-	CreatedTime int                `json:"createdTime"`
-	DeletedTime int                `json:"deletedTime"`
-	ID          int                `json:"id"`
-	Name        string             `json:"name"`
-	Status      string             `json:"status"`
-	UpdatedTime int                `json:"updatedTime"`
-}
-
-type AccountCloudApiList []AccountCloudApi
-
-type Resource struct {
-	CPU        int `json:"cpu"`
-	Disksize   int `json:"disksize"`
-	Extips     int `json:"extips"`
-	Exttraffic int `json:"exttraffic"`
-	GPU        int `json:"gpu"`
-	RAM        int `json:"ram"`
-}
-
-type Resources struct {
-	Current  Resource `json:"Current"`
-	Reserved Resource `json:"Reserved"`
-}
-
-type Computes struct {
-	Started int `json:"started"`
-	Stopped int `json:"stopped"`
-}
-
-type Machines struct {
-	Running int `json:"running"`
-	Halted  int `json:"halted"`
-}
-
-type AccountWithResources struct {
-	Account
-	Resources Resources `json:"Resources"`
-	Computes  Computes  `json:"computes"`
-	Machines  Machines  `json:"machines"`
-	Vinses    int       `json:"vinses"`
-}
-
-type AccountCompute struct {
-	AccountId      int    `json:"accountId"`
-	AccountName    string `json:"accountName"`
-	CPUs           int    `json:"cpus"`
-	CreatedBy      string `json:"createdBy"`
-	CreatedTime    int    `json:"createdTime"`
-	DeletedBy      string `json:"deletedBy"`
-	DeletedTime    int    `json:"deletedTime"`
-	ComputeId      int    `json:"id"`
-	ComputeName    string `json:"name"`
-	RAM            int    `json:"ram"`
-	Registered     bool   `json:"registered"`
-	RgId           int    `json:"rgId"`
-	RgName         string `json:"rgName"`
-	Status         string `json:"status"`
-	TechStatus     string `json:"techStatus"`
-	TotalDisksSize int    `json:"totalDisksSize"`
-	UpdatedBy      string `json:"updatedBy"`
-	UpdatedTime    int    `json:"updatedTime"`
-	UserManaged    bool   `json:"userManaged"`
-	VinsConnected  int    `json:"vinsConnected"`
-}
-
-type AccountComputesList []AccountCompute
-
-type AccountDisk struct {
-	ID      int    `json:"id"`
-	Name    string `json:"name"`
-	Pool    string `json:"pool"`
-	SepId   int    `json:"sepId"`
-	SizeMax int    `json:"sizeMax"`
-	Type    string `json:"type"`
-}
-
-type AccountDisksList []AccountDisk
-
-type AccountVin struct {
-	AccountId   int    `json:"accountId"`
-	AccountName string `json:"accountName"`
-	Computes    int    `json:"computes"`
-	CreatedBy   string `json:"createdBy"`
-	CreatedTime int    `json:"createdTime"`
-	DeletedBy   string `json:"deletedBy"`
-	DeletedTime int    `json:"deletedTime"`
-	ExternalIP  string `json:"externalIP"`
-	ID          int    `json:"id"`
-	Name        string `json:"name"`
-	Network     string `json:"network"`
-	PriVnfDevId int    `json:"priVnfDevId"`
-	RgId        int    `json:"rgId"`
-	RgName      string `json:"rgName"`
-	Status      string `json:"status"`
-	UpdatedBy   string `json:"updatedBy"`
-	UpdatedTime int    `json:"updatedTime"`
-}
-
-type AccountVinsList []AccountVin
-
-type AccountAudit struct {
-	Call         string  `json:"call"`
-	ResponseTime float64 `json:"responsetime"`
-	StatusCode   int     `json:"statuscode"`
-	Timestamp    float64 `json:"timestamp"`
-	User         string  `json:"user"`
-}
-
-type AccountAuditsList []AccountAudit
-
-type AccountRGComputes struct {
-	Started int `json:"Started"`
-	Stopped int `json:"Stopped"`
-}
-
-type AccountRGResources struct {
-	Consumed Resource `json:"Consumed"`
-	Limits   Resource `json:"Limits"`
-	Reserved Resource `json:"Reserved"`
-}
-
-type AccountRG struct {
-	Computes    AccountRGComputes  `json:"Computes"`
-	Resources   AccountRGResources `json:"Resources"`
-	CreatedBy   string             `json:"createdBy"`
-	CreatedTime int                `json:"createdTime"`
-	DeletedBy   string             `json:"deletedBy"`
-	DeletedTime int                `json:"deletedTime"`
-	RGID        int                `json:"id"`
-	Milestones  int                `json:"milestones"`
-	RGName      string             `json:"name"`
-	Status      string             `json:"status"`
-	UpdatedBy   string             `json:"updatedBy"`
-	UpdatedTime int                `json:"updatedTime"`
-	Vinses      int                `json:"vinses"`
-}
-
-type AccountRGList []AccountRG
-
-type AccountTemplate struct {
-	UNCPath   string `json:"UNCPath"`
-	AccountId int    `json:"accountId"`
-	Desc      string `json:"desc"`
-	ID        int    `json:"id"`
-	Name      string `json:"name"`
-	Public    bool   `json:"public"`
-	Size      int    `json:"size"`
-	Status    string `json:"status"`
-	Type      string `json:"type"`
-	Username  string `json:"username"`
-}
-
-type AccountTemplatesList []AccountTemplate
-
-type AccountFlipGroup struct {
-	AccountId   int    `json:"accountId"`
-	ClientType  string `json:"clientType"`
-	ConnType    string `json:"connType"`
-	CreatedBy   string `json:"createdBy"`
-	CreatedTime int    `json:"createdTime"`
-	DefaultGW   string `json:"defaultGW"`
-	DeletedBy   string `json:"deletedBy"`
-	DeletedTime int    `json:"deletedTime"`
-	Desc        string `json:"desc"`
-	GID         int    `json:"gid"`
-	GUID        int    `json:"guid"`
-	ID          int    `json:"id"`
-	IP          string `json:"ip"`
-	Milestones  int    `json:"milestones"`
-	Name        string `json:"name"`
-	NetID       int    `json:"netId"`
-	NetType     string `json:"netType"`
-	NetMask     int    `json:"netmask"`
-	Status      string `json:"status"`
-	UpdatedBy   string `json:"updatedBy"`
-	UpdatedTime int    `json:"updatedTime"`
-}
-
-type AccountFlipGroupsList []AccountFlipGroup
-
-////////////////////
-//// BSERVICE   ////
-////////////////////
-
-const bserviceCreateAPI = "/restmachine/cloudapi/bservice/create"
-const bserviceDeleteAPI = "/restmachine/cloudapi/bservice/delete"
-const bserviceDisableAPI = "/restmachine/cloudapi/bservice/disable"
-const bserviceEnableAPI = "/restmachine/cloudapi/bservice/enable"
-const bserviceGetAPI = "/restmachine/cloudapi/bservice/get"
-const bserviceGroupAddAPI = "/restmachine/cloudapi/bservice/groupAdd"
-const bserviceGroupComputeRemoveAPI = "/restmachine/cloudapi/bservice/groupComputeRemove"
-const bserviceGroupGetAPI = "/restmachine/cloudapi/bservice/groupGet"
-const bserviceGroupParentAddAPI = "/restmachine/cloudapi/bservice/groupParentAdd"
-const bserviceGroupParentRemoveAPI = "/restmachine/cloudapi/bservice/groupParentRemove"
-const bserviceGroupRemoveAPI = "/restmachine/cloudapi/bservice/groupRemove"
-const bserviceGroupResizeAPI = "/restmachine/cloudapi/bservice/groupResize"
-const bserviceGroupStartAPI = "/restmachine/cloudapi/bservice/groupStart"
-const bserviceGroupStopAPI = "/restmachine/cloudapi/bservice/groupStop"
-const bserviceGroupUpdateAPI = "/restmachine/cloudapi/bservice/groupUpdate"
-const bserviceGroupUpdateExtnetAPI = "/restmachine/cloudapi/bservice/groupUpdateExtnet"
-const bserviceGroupUpdateVinsAPI = "/restmachine/cloudapi/bservice/groupUpdateVins"
-const bserviceListAPI = "/restmachine/cloudapi/bservice/list"
-const bserviceListDeletedAPI = "/restmachine/cloudapi/bservice/listDeleted"
-const bserviceRestoreAPI = "/restmachine/cloudapi/bservice/restore"
-const bserviceSnapshotCreateAPI = "/restmachine/cloudapi/bservice/snapshotCreate"
-const bserviceSnapshotDeleteAPI = "/restmachine/cloudapi/bservice/snapshotDelete"
-const bserviceSnapshotListAPI = "/restmachine/cloudapi/bservice/snapshotList"
-const bserviceSnapshotRollbackAPI = "/restmachine/cloudapi/bservice/snapshotRollback"
-const bserviceStartAPI = "/restmachine/cloudapi/bservice/start"
-const bserviceStopAPI = "/restmachine/cloudapi/bservice/stop"
-
-///Structs
-
-type BasicServiceCompute struct {
-	CompGroupId   int    `json:"compgroupId"`
-	CompGroupName string `json:"compgroupName"`
-	CompGroupRole string `json:"compgroupRole"`
-	ID            int    `json:"id"`
-	Name          string `json:"name"`
-}
-
-type BasicServiceComputes []BasicServiceCompute
-
-type BasicServiceSnapshot struct {
-	GUID      string `json:"guid"`
-	Label     string `json:"label"`
-	Timestamp int    `json:"timestamp"`
-	Valid     bool   `json:"valid"`
-}
-
-type BasicServiceSnapshots []BasicServiceSnapshot
-
-type BasicService struct {
-	AccountId   int    `json:"accountId"`
-	AccountName string `json:"accountName"`
-	BaseDomain  string `json:"baseDomain"`
-
-	CreatedBy     string `json:"createdBy"`
-	CreatedTime   int    `json:"createdTime"`
-	DeletedBy     string `json:"deletedBy"`
-	DeletedTime   int    `json:"deletedTime"`
-	GID           int    `json:"gid"`
-	Groups        []int  `json:"groups"`
-	GUID          int    `json:"guid"`
-	ID            int    `json:"id"`
-	Name          string `json:"name"`
-	ParentSrvId   int    `json:"parentSrvId"`
-	ParentSrvType string `json:"parentSrvType"`
-	RGID          int    `json:"rgId"`
-	RGName        string `json:"rgName"`
-	SSHUser       string `json:"sshUser"`
-	Status        string `json:"status"`
-	TechStatus    string `json:"techStatus"`
-	UpdatedBy     string `json:"updatedBy"`
-	UpdatedTime   int    `json:"updatedTime"`
-	UserManaged   bool   `json:"userManaged"`
-}
-
-type BasicServiceList []BasicService
-
-type BasicServiceExtend struct {
-	BasicService
-	Computes   BasicServiceComputes  `json:"computes"`
-	CPUTotal   int                   `json:"cpuTotal"`
-	DiskTotal  int                   `json:"diskTotal"`
-	GroupsName []string              `json:"groupsName"`
-	Milestones int                   `json:"milestones"`
-	RamTotal   int                   `json:"ramTotal"`
-	Snapshots  BasicServiceSnapshots `json:"snapshots"`
-	SSHKey     string                `json:"sshKey"`
-}
-
-type BasicServiceGroupOSUser struct {
-	Login    string `json:"login"`
-	Password string `json:"password"`
-}
-
-type BasicServiceGroupOSUsers []BasicServiceGroupOSUser
-
-type BasicServicceGroupCompute struct {
-	ID         int                      `json:"id"`
-	IPAdresses []string                 `json:"ipAddresses"`
-	Name       string                   `json:"name"`
-	OSUsers    BasicServiceGroupOSUsers `json:"osUsers"`
-}
-
-type BasicServiceGroupComputes []BasicServicceGroupCompute
-
-type BasicServiceGroup struct {
-	AccountId    int                       `json:"accountId"`
-	AccountName  string                    `json:"accountName"`
-	Computes     BasicServiceGroupComputes `json:"computes"`
-	Consistency  bool                      `json:"consistency"`
-	CPU          int                       `json:"cpu"`
-	CreatedBy    string                    `json:"createdBy"`
-	CreatedTime  int                       `json:"createdTime"`
-	DeletedBy    string                    `json:"deletedBy"`
-	DeletedTime  int                       `json:"deletedTime"`
-	Disk         int                       `json:"disk"`
-	Driver       string                    `json:"driver"`
-	Extnets      []int                     `json:"extnets"`
-	GID          int                       `json:"gid"`
-	GUID         int                       `json:"guid"`
-	ID           int                       `json:"id"`
-	ImageId      int                       `json:"imageId"`
-	Milestones   int                       `json:"milestones"`
-	Name         string                    `json:"name"`
-	Parents      []int                     `json:"parents"`
-	RAM          int                       `json:"ram"`
-	RGID         int                       `json:"rgId"`
-	RGName       string                    `json:"rgName"`
-	Role         string                    `json:"role"`
-	SepId        int                       `json:"sepId"`
-	SeqNo        int                       `json:"seqNo"`
-	ServiceId    int                       `json:"serviceId"`
-	Status       string                    `json:"status"`
-	TechStatus   string                    `json:"techStatus"`
-	TimeoutStart int                       `json:"timeoutStart"`
-	UpdatedBy    string                    `json:"updatedBy"`
-	UpdatedTime  int                       `json:"updatedTime"`
-	Vinses       []int                     `json:"vinses"`
-}
-
-///////////////////
-///// EXTNET  /////
-///////////////////
-
-const extnetListAPI = "/restmachine/cloudapi/extnet/list"
-const extnetListComputesAPI = "/restmachine/cloudapi/extnet/listComputes"
-const extnetGetDefaultAPI = "/restmachine/cloudapi/extnet/getDefault"
-const extnetGetAPI = "/restmachine/cloudapi/extnet/get"
-
-type Extnet struct {
-	ID     int    `json:"id"`
-	IPCidr string `json:"ipcidr"`
-	Name   string `json:"name"`
-}
-type ExtnetExtend struct {
-	Extnet
-	IPAddr string `json:"ipaddr"`
-}
-
-type ExtnetList []Extnet
-type ExtnetExtendList []ExtnetExtend
-
-type ExtnetComputes struct {
-	AccountId   int              `json:"accountId"`
-	AccountName string           `json:"accountName"`
-	Extnets     ExtnetExtendList `json:"extnets"`
-	ID          int              `json:"id"`
-	Name        string           `json:"name"`
-	RGID        int              `json:"rgId"`
-	RGName      string           `json:"rgName"`
-}
-
-type ExtnetComputesList []ExtnetComputes
-
-type ExtnetQos struct {
-	ERate   int    `json:"eRate"`
-	GUID    string `json:"guid"`
-	InBurst int    `json:"inBurst"`
-	InRate  int    `json:"inRate"`
-}
-
-type ExtnetReservation struct {
-	ClientType string `json:"clientType"`
-	Desc       string `json:"desc"`
-	DomainName string `json:"domainname"`
-	HostName   string `json:"hostname"`
-	IP         string `json:"ip"`
-	MAC        string `json:"mac"`
-	Type       string `json:"type"`
-	VMID       int    `json:"vmId"`
-}
-
-type ExtnetReservations []ExtnetReservation
-
-type ExtnetVNFS struct {
-	DHCP int `json:"dhcp"`
-}
-
-type ExtnetDetailed struct {
-	CKey               string             `json:"_ckey"`
-	Meta               []interface{}      `json:"_meta"`
-	CheckIPs           []string           `json:"checkIPs"`
-	CheckIps           []string           `json:"checkIps"`
-	Default            bool               `json:"default"`
-	DefaultQos         ExtnetQos          `json:"defaultQos"`
-	Desc               string             `json:"desc"`
-	Dns                []string           `json:"dns"`
-	Excluded           []string           `json:"excluded"`
-	FreeIps            int                `json:"free_ips"`
-	Gateway            string             `json:"gateway"`
-	GID                int                `json:"gid"`
-	GUID               int                `json:"guid"`
-	ID                 int                `json:"id"`
-	IPCidr             string             `json:"ipcidr"`
-	Milestones         int                `json:"milestones"`
-	Name               string             `json:"name"`
-	Network            string             `json:"network"`
-	NetworkId          int                `json:"networkId"`
-	PreReservationsNum int                `json:"preReservationsNum"`
-	Prefix             int                `json:"prefix"`
-	PriVnfDevId        int                `json:"priVnfDevId"`
-	Reservations       ExtnetReservations `json:"reservations"`
-	SharedWith         []int              `json:"sharedWith"`
-	Status             string             `json:"status"`
-	VlanID             int                `json:"vlanId"`
-	VNFS               ExtnetVNFS         `json:"vnfs"`
-}
-
-//////////////
-//// VINS ////
-//////////////
-
-const vinsListAPI = "/restmachine/cloudapi/vins/list"
-
-type Vins struct {
-	AccountId   int    `json:"accountId"`
-	AccountName string `json:"accountName"`
-	CreatedBy   string `json:"createdBy"`
-	CreatedTime int    `json:"createdTime"`
-	DeletedBy   string `json:"deletedBy"`
-	DeletedTime int    `json:"deletedTime"`
-	ExternalIP  string `json:"externalIP"`
-	ID          int    `json:"id"`
-	Name        string `json:"name"`
-	Network     string `json:"network"`
-	RGID        int    `json:"rgId"`
-	RGName      string `json:"rgName"`
-	Status      string `json:"status"`
-	UpdatedBy   string `json:"updatedBy"`
-	UpdatedTime int    `json:"updatedTime"`
-	VXLanID     int    `json:"vxlanId"`
-}
-
-type VinsList []Vins

decort/network_subresource.go

@@ -23,9 +23,7 @@ import (
 	// "fmt"
 	"bytes"
 	"hash/fnv"
-
-	log "github.com/sirupsen/logrus"
-
+	log "github.com/sirupsen/logrus" 
 	// "net/url"
 	"sort"
 
@@ -45,19 +43,19 @@ func networkSubresIPAddreDiffSupperss(key, oldVal, newVal string, d *schema.Reso
 	return true // suppress difference
 }
 
-// This function is based on the original Terraform SerializeResourceForHash found
+// This function is based on the original Terraform SerializeResourceForHash found 
 // in helper/schema/serialize.go
-// It skips network subresource attributes, which are irrelevant for identification
+// It skips network subresource attributes, which are irrelevant for identification 
 // of unique network blocks
 func networkSubresourceSerialize(output *bytes.Buffer, val interface{}, resource *schema.Resource) {
 	if val == nil {
 		return
 	}
-
+	
 	rs := resource.Schema
 	m := val.(map[string]interface{})
 
-	keys := make([]string, 0, len(rs))
+	var keys []string
 	allComputed := true
 
 	for k, val := range rs {
@@ -98,7 +96,7 @@ func networkSubresourceSerialize(output *bytes.Buffer, val interface{}, resource
 // from network subresource (e.g. in flattenCompute)
 //
 // This function is based on the original Terraform function HashResource from
-// helper/schema/set.go
+// helper/schema/set.go 
 func HashNetworkSubresource(resource *schema.Resource) schema.SchemaSetFunc {
 	return func(v interface{}) int {
 		var serialized bytes.Buffer
@@ -113,11 +111,11 @@ func HashNetworkSubresource(resource *schema.Resource) schema.SchemaSetFunc {
 func networkSubresourceSchemaMake() map[string]*schema.Schema {
 	rets := map[string]*schema.Schema{
 		"net_type": {
-			Type:         schema.TypeString,
-			Required:     true,
-			StateFunc:    stateFuncToUpper,
+			Type:        schema.TypeString,
+			Required:    true,
+			StateFunc:   stateFuncToUpper,
 			ValidateFunc: validation.StringInSlice([]string{"EXTNET", "VINS"}, false), // observe case while validating
-			Description:  "Type of the network for this connection, either EXTNET or VINS.",
+			Description: "Type of the network for this connection, either EXTNET or VINS.",
 		},
 
 		"net_id": {
@@ -127,11 +125,11 @@ func networkSubresourceSchemaMake() map[string]*schema.Schema {
 		},
 
 		"ip_address": {
-			Type:             schema.TypeString,
-			Optional:         true,
-			Computed:         true,
+			Type:        schema.TypeString,
+			Optional:    true,
+			Computed:    true,
 			DiffSuppressFunc: networkSubresIPAddreDiffSupperss,
-			Description:      "Optional IP address to assign to this connection. This IP should belong to the selected network and free for use.",
+			Description: "Optional IP address to assign to this connection. This IP should belong to the selected network and free for use.",
 		},
 
 		"mac": {
@@ -139,6 +137,7 @@ func networkSubresourceSchemaMake() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "MAC address associated with this connection. MAC address is assigned automatically.",
 		},
+
 	}
 	return rets
 }

decort/node_subresource.go

@@ -58,6 +58,7 @@ func parseNode(nodeList []interface{}) K8sNodeRecord {
 func nodeToResource(node K8sNodeRecord) []interface{} {
 	mp := make(map[string]interface{})
 
+	mp["id"] = node.ID
 	mp["num"] = node.Num
 	mp["cpu"] = node.Cpu
 	mp["ram"] = node.Ram

decort/provider.go

@@ -26,6 +26,8 @@ import (
 	// "github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
+var decsController *ControllerCfg
+
 func Provider() *schema.Provider {
 	return &schema.Provider{
 		Schema: map[string]*schema.Schema{
@@ -97,71 +99,30 @@ func Provider() *schema.Provider {
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
-			"decort_resgroup":       resourceResgroup(),
-			"decort_kvmvm":          resourceCompute(),
-			"decort_disk":           resourceDisk(),
-			"decort_vins":           resourceVins(),
-			"decort_pfw":            resourcePfw(),
-			"decort_k8s":            resourceK8s(),
-			"decort_k8s_wg":         resourceK8sWg(),
-			"decort_image":          resourceImage(),
-			"decort_virtual_image":  resourceVirtualImage(),
-			"decort_cdrom_image":    resourceCDROMImage(),
-			"decort_delete_images":  resourceDeleteImages(),
-			"decort_snapshot":       resourceSnapshot(),
-			"decort_pcidevice":      resourcePcidevice(),
-			"decort_sep":            resourceSep(),
-			"decort_sep_config":     resourceSepConfig(),
-			"decort_account":        resourceAccount(),
-			"decort_bservice":       resourceBasicService(),
-			"decort_bservice_group": resourceBasicServiceGroup(),
+			"decort_resgroup":      resourceResgroup(),
+			"decort_kvmvm":         resourceCompute(),
+			"decort_disk":          resourceDisk(),
+			"decort_vins":          resourceVins(),
+			"decort_pfw":           resourcePfw(),
+			"decort_k8s":           resourceK8s(),
+			"decort_k8s_wg":        resourceK8sWg(),
+			"decort_image":         resourceImage(),
+			"decort_virtual_image": resourceVirtualImage(),
+			"decort_cdrom_image":   resourceCDROMImage(),
+			"decort_delete_images": resourceDeleteImages(),
 		},
 
 		DataSourcesMap: map[string]*schema.Resource{
-			"decort_account":                        dataSourceAccount(),
-			"decort_resgroup":                       dataSourceResgroup(),
-			"decort_kvmvm":                          dataSourceCompute(),
-			"decort_image":                          dataSourceImage(),
-			"decort_disk":                           dataSourceDisk(),
-			"decort_vins":                           dataSourceVins(),
-			"decort_grid":                           dataSourceGrid(),
-			"decort_grid_list":                      dataSourceGridList(),
-			"decort_image_list":                     dataSourceImageList(),
-			"decort_image_list_stacks":              dataSourceImageListStacks(),
-			"decort_snapshot_list":                  dataSourceSnapshotList(),
-			"decort_vgpu":                           dataSourceVGPU(),
-			"decort_pcidevice":                      dataSourcePcidevice(),
-			"decort_pcidevice_list":                 dataSourcePcideviceList(),
-			"decort_sep_list":                       dataSourceSepList(),
-			"decort_sep":                            dataSourceSep(),
-			"decort_sep_consumption":                dataSourceSepConsumption(),
-			"decort_sep_disk_list":                  dataSourceSepDiskList(),
-			"decort_sep_config":                     dataSourceSepConfig(),
-			"decort_sep_pool":                       dataSourceSepPool(),
-			"decort_disk_list":                      dataSourceDiskList(),
-			"decort_rg_list":                        dataSourceRgList(),
-			"decort_account_list":                   dataSourceAccountList(),
-			"decort_account_computes_list":          dataSourceAccountComputesList(),
-			"decort_account_disks_list":             dataSourceAccountDisksList(),
-			"decort_account_vins_list":              dataSourceAccountVinsList(),
-			"decort_account_audits_list":            dataSourceAccountAuditsList(),
-			"decort_account_rg_list":                dataSourceAccountRGList(),
-			"decort_account_consumed_units":         dataSourceAccountConsumedUnits(),
-			"decort_account_consumed_units_by_type": dataSourceAccountConsumedUnitsByType(),
-			"decort_account_reserved_units":         dataSourceAccountReservedUnits(),
-			"decort_account_templates_list":         dataSourceAccountTemplatessList(),
-			"decort_account_deleted_list":           dataSourceAccountDeletedList(),
-			"decort_account_flipgroups_list":        dataSourceAccountFlipGroupsList(),
-			"decort_bservice_list":                  dataSourceBasicServiceList(),
-			"decort_bservice":                       dataSourceBasicService(),
-			"decort_bservice_snapshot_list":         dataSourceBasicServiceSnapshotList(),
-			"decort_bservice_group":                 dataSourceBasicServiceGroup(),
-			"decort_bservice_deleted_list":          dataSourceBasicServiceDeletedList(),
-			"decort_extnet_list":                    dataSourceExtnetList(),
-			"decort_extnet_computes_list":           dataSourceExtnetComputesList(),
-			"decort_extnet":                         dataSourceExtnet(),
-			"decort_extnet_default":                 dataSourceExtnetDefault(),
-			"decort_vins_list":                      dataSourceVinsList(),
+			"decort_account":           dataSourceAccount(),
+			"decort_resgroup":          dataSourceResgroup(),
+			"decort_kvmvm":             dataSourceCompute(),
+			"decort_image":             dataSourceImage(),
+			"decort_disk":              dataSourceDisk(),
+			"decort_vins":              dataSourceVins(),
+			"decort_grid":              dataSourceGrid(),
+			"decort_grid_list":         dataSourceGridList(),
+			"decort_image_list":        dataSourceImageList(),
+			"decort_image_list_stacks": dataSourceImageListStacks(),
 			// "decort_pfw": dataSourcePfw(),
 		},
 

decort/quota_subresource.go

@@ -28,7 +28,7 @@ import (
 	// "github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
-func makeQuotaRecord(arg_list []interface{}) QuotaRecord {
+func makeQuotaRecord(arg_list []interface{}) (QuotaRecord, int) {
 	quota := QuotaRecord{
 		Cpu:        -1,
 		Ram:        -1., // this is float64, but may change in the future
@@ -63,7 +63,7 @@ func makeQuotaRecord(arg_list []interface{}) QuotaRecord {
 		quota.GpuUnits = subres_data["gpu_units"].(int)
 	}
 
-	return quota
+	return quota, 1
 }
 
 func parseQuota(quota QuotaRecord) []interface{} {

decort/resource_account.go

@@ -1,794 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"errors"
-	"net/url"
-	"strconv"
-	"strings"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	log "github.com/sirupsen/logrus"
-)
-
-func resourceAccountCreate(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceAccountCreate")
-
-	if accountId, ok := d.GetOk("account_id"); ok {
-		if exists, err := resourceAccountExists(d, m); exists {
-			if err != nil {
-				return err
-			}
-			d.SetId(strconv.Itoa(accountId.(int)))
-			err = resourceAccountRead(d, m)
-			if err != nil {
-				return err
-			}
-
-			return nil
-		}
-		return errors.New("provided account id does not exist")
-	}
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("name", d.Get("account_name").(string))
-	urlValues.Add("username", d.Get("username").(string))
-
-	if emailaddress, ok := d.GetOk("emailaddress"); ok {
-		urlValues.Add("emailaddress", emailaddress.(string))
-	}
-	if sendAccessEmails, ok := d.GetOk("send_access_emails"); ok {
-		urlValues.Add("sendAccessEmails", strconv.FormatBool(sendAccessEmails.(bool)))
-	}
-	if resLimits, ok := d.GetOk("resource_limits"); ok {
-		resLimit := resLimits.([]interface{})[0]
-		resLimitConv := resLimit.(map[string]interface{})
-		if resLimitConv["cu_m"] != nil {
-			maxMemCap := int(resLimitConv["cu_m"].(float64))
-			if maxMemCap == 0 {
-				urlValues.Add("maxMemoryCapacity", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("maxMemoryCapacity", strconv.Itoa(maxMemCap))
-			}
-		}
-		if resLimitConv["cu_d"] != nil {
-			maxDiskCap := int(resLimitConv["cu_d"].(float64))
-			if maxDiskCap == 0 {
-				urlValues.Add("maxVDiskCapacity", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("maxVDiskCapacity", strconv.Itoa(maxDiskCap))
-			}
-		}
-		if resLimitConv["cu_c"] != nil {
-			maxCPUCap := int(resLimitConv["cu_c"].(float64))
-			if maxCPUCap == 0 {
-				urlValues.Add("maxCPUCapacity", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("maxCPUCapacity", strconv.Itoa(maxCPUCap))
-			}
-
-		}
-		if resLimitConv["cu_i"] != nil {
-			maxNumPublicIP := int(resLimitConv["cu_i"].(float64))
-			if maxNumPublicIP == 0 {
-				urlValues.Add("maxNumPublicIP", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("maxNumPublicIP", strconv.Itoa(maxNumPublicIP))
-			}
-
-		}
-		if resLimitConv["cu_np"] != nil {
-			maxNP := int(resLimitConv["cu_np"].(float64))
-			if maxNP == 0 {
-				urlValues.Add("maxNetworkPeerTransfer", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("maxNetworkPeerTransfer", strconv.Itoa(maxNP))
-			}
-
-		}
-		if resLimitConv["gpu_units"] != nil {
-			gpuUnits := int(resLimitConv["gpu_units"].(float64))
-			if gpuUnits == 0 {
-				urlValues.Add("gpu_units", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("gpu_units", strconv.Itoa(gpuUnits))
-			}
-		}
-	}
-
-	accountId, err := controller.decortAPICall("POST", accountCreateAPI, urlValues)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(accountId)
-	d.Set("account_id", accountId)
-
-	err = resourceAccountRead(d, m)
-	if err != nil {
-		return err
-	}
-
-	d.SetId(id.String())
-
-	return nil
-}
-
-func resourceAccountRead(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceAccountRead")
-
-	acc, err := utilityAccountCheckPresence(d, m)
-	if acc == nil {
-		d.SetId("")
-		return err
-	}
-
-	d.Set("dc_location", acc.DCLocation)
-	d.Set("resources", flattenAccResources(acc.Resources))
-	d.Set("ckey", acc.CKey)
-	d.Set("meta", flattenMeta(acc.Meta))
-	d.Set("acl", flattenAccAcl(acc.Acl))
-	d.Set("company", acc.Company)
-	d.Set("companyurl", acc.CompanyUrl)
-	d.Set("created_by", acc.CreatedBy)
-	d.Set("created_time", acc.CreatedTime)
-	d.Set("deactivation_time", acc.DeactiovationTime)
-	d.Set("deleted_by", acc.DeletedBy)
-	d.Set("deleted_time", acc.DeletedTime)
-	d.Set("displayname", acc.DisplayName)
-	d.Set("guid", acc.GUID)
-	d.Set("account_id", acc.ID)
-	d.Set("account_name", acc.Name)
-	d.Set("resource_limits", flattenRgResourceLimits(acc.ResourceLimits))
-	d.Set("send_access_emails", acc.SendAccessEmails)
-	d.Set("service_account", acc.ServiceAccount)
-	d.Set("status", acc.Status)
-	d.Set("updated_time", acc.UpdatedTime)
-	d.Set("version", acc.Version)
-	d.Set("vins", acc.Vins)
-	d.Set("vinses", acc.Vinses)
-	d.Set("computes", flattenAccComputes(acc.Computes))
-	d.Set("machines", flattenAccMachines(acc.Machines))
-
-	return nil
-}
-
-func resourceAccountDelete(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceAccountDelete")
-
-	account, err := utilityAccountCheckPresence(d, m)
-	if account == nil {
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-	urlValues.Add("permanently", strconv.FormatBool(d.Get("permanently").(bool)))
-
-	_, err = controller.decortAPICall("POST", accountDeleteAPI, urlValues)
-	if err != nil {
-		return err
-	}
-	d.SetId("")
-
-	return nil
-}
-
-func resourceAccountExists(d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceAccountExists")
-
-	account, err := utilityAccountCheckPresence(d, m)
-	if account == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func resourceAccountEdit(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceAccountEdit")
-	c := m.(*ControllerCfg)
-
-	urlValues := &url.Values{}
-	if d.HasChange("enable") {
-		api := accountDisableAPI
-		enable := d.Get("enable").(bool)
-		if enable {
-			api = accountEnableAPI
-		}
-		urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-		_, err := c.decortAPICall("POST", api, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-
-	if d.HasChange("account_name") {
-		urlValues.Add("name", d.Get("account_name").(string))
-		urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-		_, err := c.decortAPICall("POST", accountUpdateAPI, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-	if d.HasChange("resource_limits") {
-		resLimit := d.Get("resource_limits").([]interface{})[0]
-		resLimitConv := resLimit.(map[string]interface{})
-
-		if resLimitConv["cu_m"] != nil {
-			maxMemCap := int(resLimitConv["cu_m"].(float64))
-			if maxMemCap == 0 {
-				urlValues.Add("maxMemoryCapacity", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("maxMemoryCapacity", strconv.Itoa(maxMemCap))
-			}
-		}
-		if resLimitConv["cu_d"] != nil {
-			maxDiskCap := int(resLimitConv["cu_d"].(float64))
-			if maxDiskCap == 0 {
-				urlValues.Add("maxVDiskCapacity", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("maxVDiskCapacity", strconv.Itoa(maxDiskCap))
-			}
-		}
-		if resLimitConv["cu_c"] != nil {
-			maxCPUCap := int(resLimitConv["cu_c"].(float64))
-			if maxCPUCap == 0 {
-				urlValues.Add("maxCPUCapacity", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("maxCPUCapacity", strconv.Itoa(maxCPUCap))
-			}
-
-		}
-		if resLimitConv["cu_i"] != nil {
-			maxNumPublicIP := int(resLimitConv["cu_i"].(float64))
-			if maxNumPublicIP == 0 {
-				urlValues.Add("maxNumPublicIP", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("maxNumPublicIP", strconv.Itoa(maxNumPublicIP))
-			}
-
-		}
-		if resLimitConv["cu_np"] != nil {
-			maxNP := int(resLimitConv["cu_np"].(float64))
-			if maxNP == 0 {
-				urlValues.Add("maxNetworkPeerTransfer", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("maxNetworkPeerTransfer", strconv.Itoa(maxNP))
-			}
-
-		}
-		if resLimitConv["gpu_units"] != nil {
-			gpuUnits := int(resLimitConv["gpu_units"].(float64))
-			if gpuUnits == 0 {
-				urlValues.Add("gpu_units", strconv.Itoa(-1))
-			} else {
-				urlValues.Add("gpu_units", strconv.Itoa(gpuUnits))
-			}
-		}
-
-		urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-		_, err := c.decortAPICall("POST", accountUpdateAPI, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-
-	if d.HasChange("send_access_emails") {
-		urlValues.Add("sendAccessEmails", strconv.FormatBool(d.Get("send_access_emails").(bool)))
-		urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-		_, err := c.decortAPICall("POST", accountUpdateAPI, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-
-	if d.HasChange("restore") {
-		restore := d.Get("restore").(bool)
-		if restore {
-			urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-			_, err := c.decortAPICall("POST", accountRestoreAPI, urlValues)
-			if err != nil {
-				return err
-			}
-
-			urlValues = &url.Values{}
-		}
-	}
-
-	if d.HasChange("users") {
-		deletedUsers := make([]interface{}, 0)
-		addedUsers := make([]interface{}, 0)
-		updatedUsers := make([]interface{}, 0)
-
-		old, new := d.GetChange("users")
-		oldConv := old.([]interface{})
-		newConv := new.([]interface{})
-		for _, el := range oldConv {
-			if !isContainsUser(newConv, el) {
-				deletedUsers = append(deletedUsers, el)
-			}
-		}
-		for _, el := range newConv {
-			if !isContainsUser(oldConv, el) {
-				addedUsers = append(addedUsers, el)
-			} else {
-				if isChangedUser(oldConv, el) {
-					updatedUsers = append(updatedUsers, el)
-				}
-			}
-		}
-
-		if len(deletedUsers) > 0 {
-			for _, user := range deletedUsers {
-				userConv := user.(map[string]interface{})
-				urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-				urlValues.Add("userId", userConv["user_id"].(string))
-				urlValues.Add("recursivedelete", strconv.FormatBool(userConv["recursive_delete"].(bool)))
-				_, err := c.decortAPICall("POST", accountDeleteUserAPI, urlValues)
-				if err != nil {
-					return err
-				}
-
-				urlValues = &url.Values{}
-			}
-		}
-
-		if len(addedUsers) > 0 {
-			for _, user := range addedUsers {
-				userConv := user.(map[string]interface{})
-				urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-				urlValues.Add("userId", userConv["user_id"].(string))
-				urlValues.Add("accesstype", strings.ToUpper(userConv["access_type"].(string)))
-				_, err := c.decortAPICall("POST", accountAddUserAPI, urlValues)
-				if err != nil {
-					return err
-				}
-
-				urlValues = &url.Values{}
-			}
-		}
-
-		if len(updatedUsers) > 0 {
-			for _, user := range updatedUsers {
-				userConv := user.(map[string]interface{})
-				urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-				urlValues.Add("userId", userConv["user_id"].(string))
-				urlValues.Add("accesstype", strings.ToUpper(userConv["access_type"].(string)))
-				_, err := c.decortAPICall("POST", accountUpdateUserAPI, urlValues)
-				if err != nil {
-					return err
-				}
-
-				urlValues = &url.Values{}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func isContainsUser(els []interface{}, el interface{}) bool {
-	for _, elOld := range els {
-		elOldConv := elOld.(map[string]interface{})
-		elConv := el.(map[string]interface{})
-		if elOldConv["user_id"].(string) == elConv["user_id"].(string) {
-			return true
-		}
-	}
-	return false
-}
-
-func isChangedUser(els []interface{}, el interface{}) bool {
-	for _, elOld := range els {
-		elOldConv := elOld.(map[string]interface{})
-		elConv := el.(map[string]interface{})
-		if elOldConv["user_id"].(string) == elConv["user_id"].(string) &&
-			(!strings.EqualFold(elOldConv["access_type"].(string), elConv["access_type"].(string)) ||
-				elOldConv["recursive_delete"].(bool) != elConv["recursive_delete"].(bool)) {
-			return true
-		}
-	}
-	return false
-}
-
-func resourceAccountSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"account_name": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "account name",
-		},
-		"username": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "username of owner the account",
-		},
-		"emailaddress": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "email",
-		},
-		"send_access_emails": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     true,
-			Description: "if true send emails when a user is granted access to resources",
-		},
-		"users": {
-			Type:     schema.TypeList,
-			Optional: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"user_id": {
-						Type:     schema.TypeString,
-						Required: true,
-					},
-					"access_type": {
-						Type:     schema.TypeString,
-						Required: true,
-					},
-					"recursive_delete": {
-						Type:     schema.TypeBool,
-						Optional: true,
-						Default:  false,
-					},
-				},
-			},
-		},
-		"restore": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Description: "restore a deleted account",
-		},
-		"permanently": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "whether to completely delete the account",
-		},
-		"enable": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Description: "enable/disable account",
-		},
-		"resource_limits": {
-			Type:     schema.TypeList,
-			Optional: true,
-			Computed: true,
-			MaxItems: 1,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"cu_c": {
-						Type:     schema.TypeFloat,
-						Optional: true,
-						Computed: true,
-					},
-					"cu_d": {
-						Type:     schema.TypeFloat,
-						Optional: true,
-						Computed: true,
-					},
-					"cu_i": {
-						Type:     schema.TypeFloat,
-						Optional: true,
-						Computed: true,
-					},
-					"cu_m": {
-						Type:     schema.TypeFloat,
-						Optional: true,
-						Computed: true,
-					},
-					"cu_np": {
-						Type:     schema.TypeFloat,
-						Optional: true,
-						Computed: true,
-					},
-					"gpu_units": {
-						Type:     schema.TypeFloat,
-						Optional: true,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"account_id": {
-			Type:     schema.TypeInt,
-			Optional: true,
-			Computed: true,
-		},
-		"dc_location": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"resources": {
-			Type:     schema.TypeList,
-			Computed: true,
-			MaxItems: 1,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"current": {
-						Type:     schema.TypeList,
-						Computed: true,
-						MaxItems: 1,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"cpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"disksize": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"extips": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"exttraffic": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"gpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"ram": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-					"reserved": {
-						Type:     schema.TypeList,
-						Computed: true,
-						MaxItems: 1,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"cpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"disksize": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"extips": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"exttraffic": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"gpu": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-								"ram": {
-									Type:     schema.TypeInt,
-									Computed: true,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"acl": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"can_be_deleted": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"explicit": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-					"guid": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"right": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"status": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"type": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"user_group_id": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"company": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"companyurl": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"deactivation_time": {
-			Type:     schema.TypeFloat,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"displayname": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"service_account": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"version": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"vins": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"computes": {
-			Type:     schema.TypeList,
-			Computed: true,
-			MaxItems: 1,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"started": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"stopped": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"machines": {
-			Type:     schema.TypeList,
-			Computed: true,
-			MaxItems: 1,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"halted": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"running": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"vinses": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-}
-
-func resourceAccount() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Create: resourceAccountCreate,
-		Read:   resourceAccountRead,
-		Update: resourceAccountEdit,
-		Delete: resourceAccountDelete,
-		Exists: resourceAccountExists,
-
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout60s,
-			Read:    &Timeout30s,
-			Update:  &Timeout60s,
-			Delete:  &Timeout60s,
-			Default: &Timeout60s,
-		},
-
-		Schema: resourceAccountSchemaMake(),
-	}
-}

decort/resource_bservice.go

@@ -1,554 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"errors"
-	"net/url"
-	"strconv"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	log "github.com/sirupsen/logrus"
-)
-
-func resourceBasicServiceCreate(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceBasicServiceCreate")
-
-	if serviceId, ok := d.GetOk("service_id"); ok {
-		if exists, err := resourceBasicServiceExists(d, m); exists {
-			if err != nil {
-				return err
-			}
-			id := uuid.New()
-			d.SetId(strconv.Itoa(serviceId.(int)))
-			d.Set("service_id", strconv.Itoa(serviceId.(int)))
-			err = resourceBasicServiceRead(d, m)
-			if err != nil {
-				return err
-			}
-			d.SetId(id.String())
-			return nil
-		}
-		return errors.New("provided service id does not exist")
-	}
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("name", d.Get("service_name").(string))
-	urlValues.Add("rgId", strconv.Itoa(d.Get("rg_id").(int)))
-
-	if sshKey, ok := d.GetOk("ssh_key"); ok {
-		urlValues.Add("sshKey", sshKey.(string))
-	}
-	if sshUser, ok := d.GetOk("ssh_user"); ok {
-		urlValues.Add("sshUser", sshUser.(string))
-	}
-
-	serviceId, err := controller.decortAPICall("POST", bserviceCreateAPI, urlValues)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(serviceId)
-	d.Set("service_id", serviceId)
-
-	err = resourceBasicServiceRead(d, m)
-	if err != nil {
-		return err
-	}
-
-	d.SetId(id.String())
-
-	return nil
-}
-
-func resourceBasicServiceRead(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceBasicServiceRead")
-
-	bs, err := utilityBasicServiceCheckPresence(d, m)
-	if bs == nil {
-		d.SetId("")
-		return err
-	}
-
-	d.Set("account_id", bs.AccountId)
-	d.Set("account_name", bs.AccountName)
-	d.Set("base_domain", bs.BaseDomain)
-	d.Set("computes", flattenBasicServiceComputes(bs.Computes))
-	d.Set("cpu_total", bs.CPUTotal)
-	d.Set("created_by", bs.CreatedBy)
-	d.Set("created_time", bs.CreatedTime)
-	d.Set("deleted_by", bs.DeletedBy)
-	d.Set("deleted_time", bs.DeletedTime)
-	d.Set("disk_total", bs.DiskTotal)
-	d.Set("gid", bs.GID)
-	d.Set("groups", bs.Groups)
-	d.Set("groups_name", bs.GroupsName)
-	d.Set("guid", bs.GUID)
-	d.Set("milestones", bs.Milestones)
-	d.Set("service_name", bs.Name)
-	d.Set("service_id", bs.ID)
-	d.Set("parent_srv_id", bs.ParentSrvId)
-	d.Set("parent_srv_type", bs.ParentSrvType)
-	d.Set("ram_total", bs.RamTotal)
-	d.Set("rg_id", bs.RGID)
-	d.Set("rg_name", bs.RGName)
-	d.Set("snapshots", flattenBasicServiceSnapshots(bs.Snapshots))
-	d.Set("ssh_key", bs.SSHKey)
-	d.Set("ssh_user", bs.SSHUser)
-	d.Set("status", bs.Status)
-	d.Set("tech_status", bs.TechStatus)
-	d.Set("updated_by", bs.UpdatedBy)
-	d.Set("updated_time", bs.UpdatedTime)
-	d.Set("user_managed", bs.UserManaged)
-
-	return nil
-}
-
-func resourceBasicServiceDelete(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceBasicServiceDelete")
-
-	bs, err := utilityBasicServiceCheckPresence(d, m)
-	if bs == nil {
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-	urlValues.Add("permanently", strconv.FormatBool(d.Get("permanently").(bool)))
-
-	_, err = controller.decortAPICall("POST", bserviceDeleteAPI, urlValues)
-	if err != nil {
-		return err
-	}
-	d.SetId("")
-
-	return nil
-}
-
-func resourceBasicServiceExists(d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceBasicServiceExists")
-
-	bservice, err := utilityBasicServiceCheckPresence(d, m)
-	if bservice == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func resourceBasicServiceEdit(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceBasicServiceEdit")
-	c := m.(*ControllerCfg)
-
-	urlValues := &url.Values{}
-	if d.HasChange("enable") {
-		api := bserviceDisableAPI
-		enable := d.Get("enable").(bool)
-		if enable {
-			api = bserviceEnableAPI
-		}
-		urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-
-		_, err := c.decortAPICall("POST", api, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-
-	if d.HasChange("restore") {
-		restore := d.Get("restore").(bool)
-		if restore {
-			urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-			_, err := c.decortAPICall("POST", bserviceRestoreAPI, urlValues)
-			if err != nil {
-				return err
-			}
-
-			urlValues = &url.Values{}
-		}
-	}
-
-	if d.HasChange("start") {
-		api := bserviceStopAPI
-		start := d.Get("start").(bool)
-		if start {
-			api = bserviceStartAPI
-		}
-		urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-
-		_, err := c.decortAPICall("POST", api, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-
-	if d.HasChange("snapshots") {
-		deletedSnapshots := make([]interface{}, 0)
-		addedSnapshots := make([]interface{}, 0)
-		updatedSnapshots := make([]interface{}, 0)
-
-		old, new := d.GetChange("snapshots")
-		oldConv := old.([]interface{})
-		newConv := new.([]interface{})
-		for _, el := range oldConv {
-			if !isContainsSnapshot(newConv, el) {
-				deletedSnapshots = append(deletedSnapshots, el)
-			}
-		}
-		for _, el := range newConv {
-			if !isContainsSnapshot(oldConv, el) {
-				addedSnapshots = append(addedSnapshots, el)
-			} else {
-				if isRollback(oldConv, el) {
-					updatedSnapshots = append(updatedSnapshots, el)
-				}
-			}
-		}
-
-		if len(deletedSnapshots) > 0 {
-			for _, snapshot := range deletedSnapshots {
-				snapshotConv := snapshot.(map[string]interface{})
-				urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-				urlValues.Add("label", snapshotConv["label"].(string))
-				_, err := c.decortAPICall("POST", bserviceSnapshotDeleteAPI, urlValues)
-				if err != nil {
-					return err
-				}
-
-				urlValues = &url.Values{}
-			}
-		}
-
-		if len(addedSnapshots) > 0 {
-			for _, snapshot := range addedSnapshots {
-				snapshotConv := snapshot.(map[string]interface{})
-				urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-				urlValues.Add("label", snapshotConv["label"].(string))
-				_, err := c.decortAPICall("POST", bserviceSnapshotCreateAPI, urlValues)
-				if err != nil {
-					return err
-				}
-
-				urlValues = &url.Values{}
-			}
-		}
-
-		if len(updatedSnapshots) > 0 {
-			for _, snapshot := range updatedSnapshots {
-				snapshotConv := snapshot.(map[string]interface{})
-				urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-				urlValues.Add("label", snapshotConv["label"].(string))
-				_, err := c.decortAPICall("POST", bserviceSnapshotRollbackAPI, urlValues)
-				if err != nil {
-					return err
-				}
-
-				urlValues = &url.Values{}
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func isContainsSnapshot(els []interface{}, el interface{}) bool {
-	for _, elOld := range els {
-		elOldConv := elOld.(map[string]interface{})
-		elConv := el.(map[string]interface{})
-		if elOldConv["guid"].(string) == elConv["guid"].(string) {
-			return true
-		}
-	}
-	return false
-}
-
-func isRollback(els []interface{}, el interface{}) bool {
-	for _, elOld := range els {
-		elOldConv := elOld.(map[string]interface{})
-		elConv := el.(map[string]interface{})
-		if elOldConv["guid"].(string) == elConv["guid"].(string) &&
-			elOldConv["rollback"].(bool) != elConv["rollback"].(bool) &&
-			elConv["rollback"].(bool) {
-			return true
-		}
-	}
-	return false
-}
-
-func resourceBasicServiceSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"service_name": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "Name of the service",
-		},
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the Resource Group where this service will be placed",
-		},
-		"ssh_key": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
-			Description: "SSH key to deploy for the specified user. Same key will be deployed to all computes of the service.",
-		},
-		"ssh_user": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
-			Description: "name of the user to deploy SSH key for. Pass empty string if no SSH key deployment is required",
-		},
-		"permanently": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "if set to False, Basic service will be deleted to recycle bin. Otherwise destroyed immediately",
-		},
-		"enable": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "if set to False, Basic service will be deleted to recycle bin. Otherwise destroyed immediately",
-		},
-		"restore": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "Restores BasicService instance",
-		},
-		"start": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "Start service. Starting a service technically means starting computes from all service groups according to group relations",
-		},
-		"service_id": {
-			Type:     schema.TypeInt,
-			Optional: true,
-			Computed: true,
-		},
-		"account_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"account_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"base_domain": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"computes": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"compgroup_id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"compgroup_name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"compgroup_role": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-				},
-			},
-		},
-
-		"cpu_total": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"disk_total": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"groups": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"groups_name": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"parent_srv_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"parent_srv_type": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"ram_total": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"snapshots": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Optional: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"guid": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"label": {
-						Type:     schema.TypeString,
-						Optional: true,
-						Computed: true,
-					},
-					"rollback": {
-						Type:     schema.TypeBool,
-						Optional: true,
-						Default:  false,
-					},
-					"timestamp": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"valid": {
-						Type:     schema.TypeBool,
-						Computed: true,
-					},
-				},
-			},
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"tech_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"user_managed": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-	}
-}
-
-func resourceBasicService() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Create: resourceBasicServiceCreate,
-		Read:   resourceBasicServiceRead,
-		Update: resourceBasicServiceEdit,
-		Delete: resourceBasicServiceDelete,
-		Exists: resourceBasicServiceExists,
-
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout60s,
-			Read:    &Timeout30s,
-			Update:  &Timeout60s,
-			Delete:  &Timeout60s,
-			Default: &Timeout60s,
-		},
-
-		Schema: resourceBasicServiceSchemaMake(),
-	}
-}

decort/resource_bservice_group.go

@@ -1,661 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"errors"
-	"net/url"
-	"strconv"
-	"strings"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	log "github.com/sirupsen/logrus"
-)
-
-func resourceBasicServiceGroupCreate(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceBasicServiceGroupCreate")
-
-	if compgroupId, ok := d.GetOk("compgroup_id"); ok {
-		if _, ok := d.GetOk("service_id"); ok {
-			if exists, err := resourceBasicServiceGroupExists(d, m); exists {
-				if err != nil {
-					return err
-				}
-				id := uuid.New()
-				d.SetId(strconv.Itoa(compgroupId.(int)))
-				d.Set("compgroup_id", strconv.Itoa(compgroupId.(int)))
-				err = resourceBasicServiceGroupRead(d, m)
-				if err != nil {
-					return err
-				}
-				d.SetId(id.String())
-				return nil
-			}
-			return errors.New("provided compgroup id does not exist")
-		}
-	}
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-	urlValues.Add("name", d.Get("compgroup_name").(string))
-
-	urlValues.Add("count", strconv.Itoa(d.Get("comp_count").(int)))
-	urlValues.Add("cpu", strconv.Itoa(d.Get("cpu").(int)))
-	urlValues.Add("ram", strconv.Itoa(d.Get("ram").(int)))
-	urlValues.Add("disk", strconv.Itoa(d.Get("disk").(int)))
-	urlValues.Add("imageId", strconv.Itoa(d.Get("image_id").(int)))
-	urlValues.Add("driver", strings.ToUpper(d.Get("driver").(string)))
-
-	if role, ok := d.GetOk("role"); ok {
-		urlValues.Add("role", role.(string))
-	}
-
-	if timeoutStart, ok := d.GetOk("timeout_start"); ok {
-		urlValues.Add("timeoutStart", strconv.Itoa(timeoutStart.(int)))
-	}
-
-	if vinses, ok := d.GetOk("vinses"); ok {
-		vs := vinses.([]interface{})
-		temp := ""
-		l := len(vs)
-		for i, v := range vs {
-			s := strconv.Itoa(v.(int))
-			if i != (l - 1) {
-				s += ","
-			}
-			temp = temp + s
-		}
-		temp = "[" + temp + "]"
-		urlValues.Add("vinses", temp)
-	}
-	if extnets, ok := d.GetOk("extnets"); ok {
-		es := extnets.([]interface{})
-		temp := ""
-		l := len(es)
-		for i, e := range es {
-			s := strconv.Itoa(e.(int))
-			if i != (l - 1) {
-				s += ","
-			}
-			temp = temp + s
-		}
-		temp = "[" + temp + "]"
-		urlValues.Add("extnets", temp)
-	}
-
-	compgroupId, err := controller.decortAPICall("POST", bserviceGroupAddAPI, urlValues)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(compgroupId)
-	d.Set("compgroup_id", compgroupId)
-
-	err = resourceBasicServiceGroupRead(d, m)
-	if err != nil {
-		return err
-	}
-
-	d.SetId(id.String())
-
-	return nil
-}
-
-func resourceBasicServiceGroupRead(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceBasicServiceGroupRead")
-
-	bsg, err := utilityBasicServiceGroupCheckPresence(d, m)
-	if bsg == nil {
-		d.SetId("")
-		return err
-	}
-
-	d.Set("account_id", bsg.AccountId)
-	d.Set("account_name", bsg.AccountName)
-	d.Set("computes", flattenBSGroupComputes(bsg.Computes))
-	d.Set("consistency", bsg.Consistency)
-	d.Set("cpu", bsg.CPU)
-	d.Set("created_by", bsg.CreatedBy)
-	d.Set("created_time", bsg.CreatedTime)
-	d.Set("deleted_by", bsg.DeletedBy)
-	d.Set("deleted_time", bsg.DeletedTime)
-	d.Set("disk", bsg.Disk)
-	d.Set("driver", bsg.Driver)
-	d.Set("extnets", bsg.Extnets)
-	d.Set("gid", bsg.GID)
-	d.Set("guid", bsg.GUID)
-	d.Set("image_id", bsg.ImageId)
-	d.Set("milestones", bsg.Milestones)
-	d.Set("compgroup_name", bsg.Name)
-	d.Set("compgroup_id", bsg.ID)
-	d.Set("parents", bsg.Parents)
-	d.Set("ram", bsg.RAM)
-	d.Set("rg_id", bsg.RGID)
-	d.Set("rg_name", bsg.RGName)
-	d.Set("role", bsg.Role)
-	d.Set("sep_id", bsg.SepId)
-	d.Set("seq_no", bsg.SeqNo)
-	d.Set("status", bsg.Status)
-	d.Set("tech_status", bsg.TechStatus)
-	d.Set("timeout_start", bsg.TimeoutStart)
-	d.Set("updated_by", bsg.UpdatedBy)
-	d.Set("updated_time", bsg.UpdatedTime)
-	d.Set("vinses", bsg.Vinses)
-
-	return nil
-}
-
-func resourceBasicServiceGroupDelete(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceBasicServiceGroupDelete")
-
-	bsg, err := utilityBasicServiceGroupCheckPresence(d, m)
-	if bsg == nil {
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-	urlValues.Add("compgroupId", strconv.Itoa(d.Get("compgroup_id").(int)))
-
-	_, err = controller.decortAPICall("POST", bserviceGroupRemoveAPI, urlValues)
-	if err != nil {
-		return err
-	}
-	d.SetId("")
-
-	return nil
-}
-
-func resourceBasicServiceGroupExists(d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceBasicServiceGroupExists")
-
-	bserviceGroup, err := utilityBasicServiceGroupCheckPresence(d, m)
-	if bserviceGroup == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func resourceBasicServiceGroupEdit(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceBasicServiceGroupEdit")
-	c := m.(*ControllerCfg)
-
-	urlValues := &url.Values{}
-
-	if d.HasChange("comp_count") {
-		urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-		urlValues.Add("compgroupId", strconv.Itoa(d.Get("compgroup_id").(int)))
-		urlValues.Add("count", strconv.Itoa(d.Get("comp_count").(int)))
-		urlValues.Add("mode", strings.ToUpper(d.Get("mode").(string)))
-		_, err := c.decortAPICall("POST", bserviceGroupResizeAPI, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-
-	if d.HasChange("start") {
-		api := bserviceGroupStopAPI
-		start := d.Get("start").(bool)
-		if start {
-			api = bserviceGroupStartAPI
-		} else {
-			urlValues.Add("force", strconv.FormatBool(d.Get("force_stop").(bool)))
-		}
-		urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-		urlValues.Add("compgroupId", strconv.Itoa(d.Get("compgroup_id").(int)))
-
-		_, err := c.decortAPICall("POST", api, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-
-	if d.HasChanges("compgroup_name", "ram", "cpu", "disk", "role") {
-		urlValues.Add("name", d.Get("compgroup_name").(string))
-		urlValues.Add("cpu", strconv.Itoa(d.Get("cpu").(int)))
-		urlValues.Add("ram", strconv.Itoa(d.Get("ram").(int)))
-		urlValues.Add("disk", strconv.Itoa(d.Get("disk").(int)))
-		urlValues.Add("role", d.Get("role").(string))
-		urlValues.Add("force", strconv.FormatBool(d.Get("force_update").(bool)))
-
-		urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-		urlValues.Add("compgroupId", strconv.Itoa(d.Get("compgroup_id").(int)))
-
-		_, err := c.decortAPICall("POST", bserviceGroupUpdateAPI, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-
-	if d.HasChange("extnets") {
-		extnets := d.Get("extnets").([]interface{})
-		temp := ""
-		l := len(extnets)
-		for i, e := range extnets {
-			s := strconv.Itoa(e.(int))
-			if i != (l - 1) {
-				s += ",\n"
-			} else {
-				s += "\n"
-			}
-			temp = temp + s
-		}
-		temp = "[" + temp + "]"
-
-		urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-		urlValues.Add("compgroupId", strconv.Itoa(d.Get("compgroup_id").(int)))
-		urlValues.Add("extnets", temp)
-		_, err := c.decortAPICall("POST", bserviceGroupUpdateExtnetAPI, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-
-	if d.HasChange("vinses") {
-		vinses := d.Get("vinses").([]interface{})
-		temp := ""
-		l := len(vinses)
-		for i, v := range vinses {
-			s := strconv.Itoa(v.(int))
-			if i != (l - 1) {
-				s += ",\n"
-			} else {
-				s += "\n"
-			}
-			temp = temp + s
-		}
-		temp = "[" + temp + "]"
-
-		urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-		urlValues.Add("compgroupId", strconv.Itoa(d.Get("compgroup_id").(int)))
-		urlValues.Add("vinses", temp)
-		_, err := c.decortAPICall("POST", bserviceGroupUpdateVinsAPI, urlValues)
-		if err != nil {
-			return err
-		}
-
-		urlValues = &url.Values{}
-	}
-
-	if d.HasChange("parents") {
-		deletedParents := make([]interface{}, 0)
-		addedParents := make([]interface{}, 0)
-
-		old, new := d.GetChange("parents")
-		oldConv := old.([]interface{})
-		newConv := new.([]interface{})
-		for _, el := range oldConv {
-			if !isContainsParent(newConv, el) {
-				deletedParents = append(deletedParents, el)
-			}
-		}
-		for _, el := range newConv {
-			if !isContainsParent(oldConv, el) {
-				addedParents = append(addedParents, el)
-			}
-		}
-
-		if len(deletedParents) > 0 {
-			for _, parent := range deletedParents {
-				parentConv := parent.(int)
-
-				urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-				urlValues.Add("compgroupId", strconv.Itoa(d.Get("compgroup_id").(int)))
-				urlValues.Add("parentId", strconv.Itoa(parentConv))
-
-				_, err := c.decortAPICall("POST", bserviceGroupParentRemoveAPI, urlValues)
-				if err != nil {
-					return err
-				}
-
-				urlValues = &url.Values{}
-			}
-		}
-
-		if len(addedParents) > 0 {
-			for _, parent := range addedParents {
-				parentConv := parent.(int)
-				urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-				urlValues.Add("compgroupId", strconv.Itoa(d.Get("compgroup_id").(int)))
-				urlValues.Add("parentId", strconv.Itoa(parentConv))
-				_, err := c.decortAPICall("POST", bserviceGroupParentAddAPI, urlValues)
-				if err != nil {
-					return err
-				}
-
-				urlValues = &url.Values{}
-			}
-		}
-	}
-
-	if d.HasChange("remove_computes") {
-		rcs := d.Get("remove_computes").([]interface{})
-		if len(rcs) > 0 {
-			for _, rc := range rcs {
-				urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-				urlValues.Add("compgroupId", strconv.Itoa(d.Get("compgroup_id").(int)))
-				urlValues.Add("computeId", strconv.Itoa(rc.(int)))
-
-				_, err := c.decortAPICall("POST", bserviceGroupComputeRemoveAPI, urlValues)
-				if err != nil {
-					return err
-				}
-
-				urlValues = &url.Values{}
-			}
-		}
-	}
-
-	return nil
-}
-
-func isContainsParent(els []interface{}, el interface{}) bool {
-	for _, elOld := range els {
-		elOldConv := elOld.(int)
-		elConv := el.(int)
-		if elOldConv == elConv {
-			return true
-		}
-	}
-	return false
-}
-
-func resourceBasicServiceGroupSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"service_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "ID of the Basic Service to add a group to",
-		},
-		"compgroup_name": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "name of the Compute Group to add",
-		},
-		"comp_count": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "computes number. Defines how many computes must be there in the group",
-		},
-		"cpu": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "compute CPU number. All computes in the group have the same CPU count",
-		},
-		"ram": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "compute RAM volume in MB. All computes in the group have the same RAM volume",
-		},
-		"disk": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "compute boot disk size in GB",
-		},
-		"image_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "OS image ID to create computes from",
-		},
-		"driver": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "compute driver like a KVM_X86, KVM_PPC, etc.",
-		},
-		"role": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
-			Description: "group role tag. Can be empty string, does not have to be unique",
-		},
-		"timeout_start": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Computed:    true,
-			Description: "time of Compute Group readiness",
-		},
-		"extnets": {
-			Type:     schema.TypeList,
-			Optional: true,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-			Description: "list of external networks to connect computes to",
-		},
-		"vinses": {
-			Type:     schema.TypeList,
-			Optional: true,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-			Description: "list of ViNSes to connect computes to",
-		},
-		"mode": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "RELATIVE",
-			ValidateFunc: validation.StringInSlice([]string{"RELATIVE", "ABSOLUTE"}, false),
-			Description:  "(RELATIVE;ABSOLUTE) either delta or absolute value of computes",
-		},
-		"start": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "Start the specified Compute Group within BasicService",
-		},
-		"force_stop": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "force stop Compute Group",
-		},
-		"force_update": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "force resize Compute Group",
-		},
-		"parents": {
-			Type:     schema.TypeList,
-			Optional: true,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"remove_computes": {
-			Type:     schema.TypeList,
-			Optional: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"compgroup_id": {
-			Type:     schema.TypeInt,
-			Optional: true,
-			Computed: true,
-		},
-		"account_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"account_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"computes": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"id": {
-						Type:     schema.TypeInt,
-						Computed: true,
-					},
-					"ip_addresses": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Schema{
-							Type: schema.TypeString,
-						},
-					},
-					"name": {
-						Type:     schema.TypeString,
-						Computed: true,
-					},
-					"os_users": {
-						Type:     schema.TypeList,
-						Computed: true,
-						Elem: &schema.Resource{
-							Schema: map[string]*schema.Schema{
-								"login": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-								"password": {
-									Type:     schema.TypeString,
-									Computed: true,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		"consistency": {
-			Type:     schema.TypeBool,
-			Computed: true,
-		},
-		"created_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"created_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"deleted_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"deleted_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"gid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"rg_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"sep_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"seq_no": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"tech_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_by": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"updated_time": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-	}
-}
-
-func resourceBasicServiceGroup() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Create: resourceBasicServiceGroupCreate,
-		Read:   resourceBasicServiceGroupRead,
-		Update: resourceBasicServiceGroupEdit,
-		Delete: resourceBasicServiceGroupDelete,
-		Exists: resourceBasicServiceGroupExists,
-
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout60s,
-			Read:    &Timeout30s,
-			Update:  &Timeout60s,
-			Delete:  &Timeout60s,
-			Default: &Timeout60s,
-		},
-
-		Schema: resourceBasicServiceGroupSchemaMake(),
-	}
-}

decort/resource_cdrom_image.go

@@ -385,10 +385,16 @@ func resourceCDROMImage() *schema.Resource {
 
 		CustomizeDiff: customdiff.All(
 			customdiff.IfValueChange("enabled", func(old, new, meta interface{}) bool {
-				return old.(bool) != new.(bool)
+				if old.(bool) != new.(bool) {
+					return true
+				}
+				return false
 			}, resourceImageChangeEnabled),
 			customdiff.IfValueChange("name", func(old, new, meta interface{}) bool {
-				return old.(string) != new.(string) && old.(string) != ""
+				if old.(string) != new.(string) && old.(string) != "" {
+					return true
+				}
+				return false
 			}, resourceImageEditName),
 			customdiff.IfValueChange("shared_with", func(old, new, meta interface{}) bool {
 				o := old.([]interface{})
@@ -405,10 +411,16 @@ func resourceCDROMImage() *schema.Resource {
 						count++
 					}
 				}
-				return count == 0
+				if count == 0 {
+					return true
+				}
+				return false
 			}, resourceImageShare),
 			customdiff.IfValueChange("computeci_id", func(old, new, meta interface{}) bool {
-				return old.(int) != new.(int)
+				if old.(int) != new.(int) {
+					return true
+				}
+				return false
 			}, resourceImageChangeComputeci),
 			customdiff.IfValueChange("enabled_stacks", func(old, new, meta interface{}) bool {
 				o := old.([]interface{})
@@ -425,7 +437,10 @@ func resourceCDROMImage() *schema.Resource {
 						count++
 					}
 				}
-				return count == 0
+				if count == 0 {
+					return true
+				}
+				return false
 			}, resourceImageUpdateNodes),
 		),
 

decort/resource_compute.go

@@ -75,13 +75,6 @@ func resourceComputeCreate(d *schema.ResourceData, m interface{}) error {
 		urlValues.Add("desc", argVal.(string))
 	}
 
-	if sepID, ok := d.GetOk("sep_id"); ok {
-		urlValues.Add("sepId", strconv.Itoa(sepID.(int)))
-	}
-
-	if pool, ok := d.GetOk("pool"); ok {
-		urlValues.Add("pool", pool.(string))
-	}
 	/*
 		sshKeysVal, sshKeysSet := d.GetOk("ssh_keys")
 		if sshKeysSet {
@@ -139,7 +132,7 @@ func resourceComputeCreate(d *schema.ResourceData, m interface{}) error {
 		log.Debugf("resourceComputeCreate: calling utilityComputeExtraDisksConfigure to attach %d extra disk(s)", argVal.(*schema.Set).Len())
 		err = controller.utilityComputeExtraDisksConfigure(d, false) // do_delta=false, as we are working on a new compute
 		if err != nil {
-			log.Errorf("resourceComputeCreate: error when attaching extra disk(s) to a new Compute ID %d: %v", compId, err)
+			log.Errorf("resourceComputeCreate: error when attaching extra disk(s) to a new Compute ID %s: %s", compId, err)
 			extraDisksOk = false
 		}
 	}
@@ -174,7 +167,8 @@ func resourceComputeCreate(d *schema.ResourceData, m interface{}) error {
 		reqValues := &url.Values{}
 		reqValues.Add("computeId", fmt.Sprintf("%d", compId))
 		log.Debugf("resourceComputeCreate: starting Compute ID %d after completing its resource configuration", compId)
-		if _, err := controller.decortAPICall("POST", ComputeStartAPI, reqValues); err != nil {
+		apiResp, err = controller.decortAPICall("POST", ComputeStartAPI, reqValues)
+		if err != nil {
 			return err
 		}
 	}
@@ -252,7 +246,6 @@ func resourceComputeUpdate(d *schema.ResourceData, m interface{}) error {
 		log.Debugf("resourceComputeUpdate: changing CPU %d -> %d and/or RAM %d -> %d",
 			oldCpu.(int), newCpu.(int),
 			oldRam.(int), newRam.(int))
-		params.Add("force", "true")
 		_, err := controller.decortAPICall("POST", ComputeResizeAPI, params)
 		if err != nil {
 			return err
@@ -269,13 +262,13 @@ func resourceComputeUpdate(d *schema.ResourceData, m interface{}) error {
 		bdsParams.Add("size", fmt.Sprintf("%d", newSize.(int)))
 		log.Debugf("resourceComputeUpdate: compute ID %s, boot disk ID %d resize %d -> %d",
 			d.Id(), d.Get("boot_disk_id").(int), oldSize.(int), newSize.(int))
-		_, err := controller.decortAPICall("POST", DisksResizeAPI, bdsParams)
+		_, err := controller.decortAPICall("POST", DisksResizeAPI, params)
 		if err != nil {
 			return err
 		}
 		d.SetPartial("boot_disk_size")
 	} else if oldSize.(int) > newSize.(int) {
-		log.Warnf("resourceComputeUpdate: compute ID %s - shrinking boot disk is not allowed", d.Id())
+		log.Warnf("resourceComputeUpdate: compute ID %d - shrinking boot disk is not allowed", d.Id())
 	}
 
 	// 3. Calculate and apply changes to data disks
@@ -326,9 +319,6 @@ func resourceComputeDelete(d *schema.ResourceData, m interface{}) error {
 
 	compFacts, err := utilityComputeCheckPresence(d, m)
 	if compFacts == "" {
-		if err != nil {
-			return err
-		}
 		// the target Compute does not exist - in this case according to Terraform best practice
 		// we exit from Destroy method without error
 		return nil
@@ -463,22 +453,6 @@ func resourceCompute() *schema.Resource {
 				Description: "This compute instance boot disk size in GB. Make sure it is large enough to accomodate selected OS image.",
 			},
 
-			"sep_id": {
-				Type: schema.TypeInt,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
-				Description: "ID of SEP to create bootDisk on. Uses image's sepId if not set.",
-			},
-
-			"pool": {
-				Type: schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
-				Description: "Pool to use if sepId is set, can be also empty if needed to be chosen by system.",
-			},
-
 			"extra_disks": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -565,6 +539,39 @@ func resourceCompute() *schema.Resource {
 				Default:     true,
 				Description: "Is compute started.",
 			},
+
+			/*
+				"disks": {
+					Type:     schema.TypeList,
+					Computed: true,
+					Elem: &schema.Resource{
+						Schema: dataSourceDiskSchemaMake(), // ID, type,  name, size, account ID, SEP ID, SEP type, pool, status, tech status, compute ID, image ID
+					},
+					Description: "Detailed specification for all disks attached to this compute instance (including bood disk).",
+				},
+
+				"interfaces": {
+					Type:     schema.TypeList,
+					Computed: true,
+					Elem: &schema.Resource{
+						Schema: interfaceSubresourceSchemaMake(),
+					},
+					Description: "Specification for the virtual NICs configured on this compute instance.",
+				},
+
+
+				"status": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "Current model status of this compute instance.",
+				},
+
+				"tech_status": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "Current technical status of this compute instance.",
+				},
+			*/
 		},
 	}
 }

decort/resource_disk.go

@@ -47,19 +47,13 @@ func resourceDiskCreate(d *schema.ResourceData, m interface{}) error {
 	urlValues.Add("name", d.Get("name").(string))
 	urlValues.Add("size", fmt.Sprintf("%d", d.Get("size").(int)))
 	urlValues.Add("type", "D") // NOTE: only disks of Data type are managed via plugin
-
-	if sepId, ok := d.GetOk("sep_id"); ok {
-		urlValues.Add("sep_id", strconv.Itoa(sepId.(int)))
-	}
-
-	if poolName, ok := d.GetOk("pool"); ok {
-		urlValues.Add("pool", poolName.(string))
-	}
-
+	urlValues.Add("sep_id", fmt.Sprintf("%d", d.Get("sep_id").(int)))
+	urlValues.Add("pool", d.Get("pool").(string))
+	
 	argVal, argSet := d.GetOk("description")
 	if argSet {
 		urlValues.Add("description", argVal.(string))
-	}
+	} 
 
 	apiResp, err := controller.decortAPICall("POST", DisksCreateAPI, urlValues)
 	if err != nil {
@@ -71,9 +65,9 @@ func resourceDiskCreate(d *schema.ResourceData, m interface{}) error {
 
 	log.Debugf("resourceDiskCreate: new Disk ID / name %d / %s creation sequence complete", diskId, d.Get("name").(string))
 
-	// We may reuse dataSourceDiskRead here as we maintain similarity
+	// We may reuse dataSourceDiskRead here as we maintain similarity 
 	// between Disk resource and Disk data source schemas
-	// Disk resource read function will also update resource ID on success, so that Terraform
+	// Disk resource read function will also update resource ID on success, so that Terraform 
 	// will know the resource exists (however, we already did it a few lines before)
 	return dataSourceDiskRead(d, m)
 }
@@ -106,8 +100,8 @@ func resourceDiskUpdate(d *schema.ResourceData, m interface{}) error {
 
 	oldSize, newSize := d.GetChange("size")
 	if oldSize.(int) < newSize.(int) {
-		log.Debugf("resourceDiskUpdate: resizing disk ID %s - %d GB -> %d GB",
-			d.Id(), oldSize.(int), newSize.(int))
+		log.Debugf("resourceDiskUpdate: resizing disk ID %s - %d GB -> %d GB", 
+		           d.Id(), oldSize.(int), newSize.(int))
 		sizeParams := &url.Values{}
 		sizeParams.Add("diskId", d.Id())
 		sizeParams.Add("size", fmt.Sprintf("%d", newSize.(int)))
@@ -122,8 +116,8 @@ func resourceDiskUpdate(d *schema.ResourceData, m interface{}) error {
 
 	oldName, newName := d.GetChange("name")
 	if oldName.(string) != newName.(string) {
-		log.Debugf("resourceDiskUpdate: renaming disk ID %d - %s -> %s",
-			d.Get("disk_id").(int), oldName.(string), newName.(string))
+		log.Debugf("resourceDiskUpdate: renaming disk ID %d - %s -> %s", 
+		           d.Get("disk_id").(int), oldName.(string), newName.(string))
 		renameParams := &url.Values{}
 		renameParams.Add("diskId", d.Id())
 		renameParams.Add("name", newName.(string))
@@ -135,24 +129,24 @@ func resourceDiskUpdate(d *schema.ResourceData, m interface{}) error {
 	}
 
 	/*
-		NOTE: plugin will manage disks of type "Data" only, and type cannot be changed once disk is created
+	NOTE: plugin will manage disks of type "Data" only, and type cannot be changed once disk is created
 
-		oldType, newType := d.GetChange("type")
-		if oldType.(string) != newType.(string) {
-			return fmt.Errorf("resourceDiskUpdate: Disk ID %s - changing type of existing disk not allowed", d.Id())
-		}
+	oldType, newType := d.GetChange("type")
+	if oldType.(string) != newType.(string) {
+		return fmt.Errorf("resourceDiskUpdate: Disk ID %s - changing type of existing disk not allowed", d.Id())
+	}
 	*/
 
 	d.Partial(false)
 
-	// we may reuse dataSourceDiskRead here as we maintain similarity
+	// we may reuse dataSourceDiskRead here as we maintain similarity 
 	// between Compute resource and Compute data source schemas
-	return dataSourceDiskRead(d, m)
+	return dataSourceDiskRead(d, m) 
 }
 
 func resourceDiskDelete(d *schema.ResourceData, m interface{}) error {
-	// NOTE: this function tries to detach and destroy target Disk "permanently", so
-	// there is no way to restore it.
+	// NOTE: this function tries to detach and destroy target Disk "permanently", so 
+	// there is no way to restore it. 
 	// If, however, the disk is attached to a compute, the method will
 	// fail (by failing the underpinning DECORt API call, which is issued with detach=false)
 	log.Debugf("resourceDiskDelete: called for Disk ID / name %d / %s, Account ID %d",
@@ -160,9 +154,6 @@ func resourceDiskDelete(d *schema.ResourceData, m interface{}) error {
 
 	diskFacts, err := utilityDiskCheckPresence(d, m)
 	if diskFacts == "" {
-		if err != nil {
-			return err
-		}
 		// the specified Disk does not exist - in this case according to Terraform best practice
 		// we exit from Destroy method without error
 		return nil
@@ -175,8 +166,8 @@ func resourceDiskDelete(d *schema.ResourceData, m interface{}) error {
 	// However, this may change in the future, as TF state management logic may want
 	// to delete disk resource BEFORE it is detached from compute instance, and, while
 	// perfectly OK from data preservation viewpoint, this is breaking expected TF workflow
-	// in the eyes of an experienced TF user
-	params.Add("detach", "0")
+	// in the eyes of an experienced TF user 
+	params.Add("detach", "0") 
 	params.Add("permanently", "1")
 
 	controller := m.(*ControllerCfg)
@@ -207,7 +198,7 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 	rets := map[string]*schema.Schema{
 		"name": {
 			Type:        schema.TypeString,
-			Required:    true,
+			Optional:    true,
 			Description: "Name of this disk. NOTE: disk names are NOT unique within an account. If disk ID is specified, disk name is ignored.",
 		},
 
@@ -219,34 +210,34 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 
 		"account_id": {
 			Type:        schema.TypeInt,
-			Required:    true,
+			Optional:    true,
 			Description: "ID of the account this disk belongs to.",
 		},
 
 		"sep_id": {
 			Type:        schema.TypeInt,
-			Optional:    true,
-			Computed:    true,
+			Required:    true,
 			ForceNew:    true,
+			ValidateFunc: validation.IntAtLeast(1),
 			Description: "Storage end-point provider serving this disk. Cannot be changed for existing disk.",
 		},
 
 		"pool": {
 			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
+			Required:    true,
 			ForceNew:    true,
+			ValidateFunc: validation.StringIsNotEmpty,
 			Description: "Pool where this disk is located. Cannot be changed for existing disk.",
 		},
 
 		"size": {
-			Type:         schema.TypeInt,
-			Required:     true,
+			Type:        schema.TypeInt,
+			Required:    true,
 			ValidateFunc: validation.IntAtLeast(1),
-			Description:  "Size of the disk in GB. Note, that existing disks can only be grown in size.",
+			Description: "Size of the disk in GB. Note, that existing disks can only be grown in size.",
 		},
 
-		/* We moved "type" attribute to computed attributes section, as plugin manages disks of only
+		/* We moved "type" attribute to computed attributes section, as plugin manages disks of only 
 		   one type - "D", e.g. data disks.
 		"type": {
 			Type:        schema.TypeString,
@@ -265,7 +256,7 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 			Description: "Optional user-defined text description of this disk.",
 		},
 
-		// The rest of the attributes are all computed
+		// The rest of the attributes are all computed 
 		"account_name": {
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -291,14 +282,14 @@ func resourceDiskSchemaMake() map[string]*schema.Schema {
 		},
 
 		/*
-			"snapshots": {
-				Type:        schema.TypeList,
-				Computed:    true,
-				Elem:          &schema.Resource {
-					Schema:    snapshotSubresourceSchemaMake(),
-				},
-				Description: "List of user-created snapshots for this disk."
+		"snapshots": {
+			Type:        schema.TypeList,
+			Computed:    true,
+			Elem:          &schema.Resource {
+				Schema:    snapshotSubresourceSchemaMake(),
 			},
+			Description: "List of user-created snapshots for this disk."
+		},
 		*/
 	}
 

decort/resource_image.go

@@ -87,7 +87,8 @@ func resourceImageCreate(d *schema.ResourceData, m interface{}) error {
 	}
 
 	api := ""
-	if isSync := d.Get("sync").(bool); !isSync {
+	isSync := d.Get("sync").(bool)
+	if !isSync {
 		api = imageCreateAPI
 	} else {
 		api = imageSyncCreateAPI
@@ -639,10 +640,16 @@ func resourceImage() *schema.Resource {
 		},
 		CustomizeDiff: customdiff.All(
 			customdiff.IfValueChange("enabled", func(old, new, meta interface{}) bool {
-				return old.(bool) != new.(bool)
+				if old.(bool) != new.(bool) {
+					return true
+				}
+				return false
 			}, resourceImageChangeEnabled),
 			customdiff.IfValueChange("name", func(old, new, meta interface{}) bool {
-				return old.(string) != new.(string) && old.(string) != ""
+				if old.(string) != new.(string) && old.(string) != "" {
+					return true
+				}
+				return false
 			}, resourceImageEditName),
 			customdiff.IfValueChange("shared_with", func(old, new, meta interface{}) bool {
 				o := old.([]interface{})
@@ -660,10 +667,16 @@ func resourceImage() *schema.Resource {
 						count++
 					}
 				}
-				return count == 0
+				if count == 0 {
+					return true
+				}
+				return false
 			}, resourceImageShare),
 			customdiff.IfValueChange("computeci_id", func(old, new, meta interface{}) bool {
-				return old.(int) != new.(int)
+				if old.(int) != new.(int) {
+					return true
+				}
+				return false
 			}, resourceImageChangeComputeci),
 			customdiff.IfValueChange("enabled_stacks", func(old, new, meta interface{}) bool {
 				o := old.([]interface{})
@@ -680,7 +693,10 @@ func resourceImage() *schema.Resource {
 						count++
 					}
 				}
-				return count == 0
+				if count == 0 {
+					return true
+				}
+				return false
 			}, resourceImageUpdateNodes),
 		),
 

decort/resource_k8s.go

@@ -73,11 +73,10 @@ func resourceK8sCreate(d *schema.ResourceData, m interface{}) error {
 	//}
 	urlValues.Add("withLB", strconv.FormatBool(true))
 
-	if extNet, ok := d.GetOk("extnet_id"); ok {
-		urlValues.Add("extnetId", strconv.Itoa(extNet.(int)))
-	} else {
-		urlValues.Add("extnetId", "0")
-	}
+	//if extNet, ok := d.GetOk("extnet_id"); ok {
+	//urlValues.Add("extnetId", strconv.Itoa(extNet.(int)))
+	//}
+	urlValues.Add("extnetId", strconv.Itoa(0))
 
 	//if desc, ok := d.GetOk("desc"); ok {
 	//urlValues.Add("desc", desc.(string))
@@ -122,21 +121,6 @@ func resourceK8sCreate(d *schema.ResourceData, m interface{}) error {
 
 	d.Set("default_wg_id", k8s.Groups.Workers[0].ID)
 
-	urlValues = &url.Values{}
-	urlValues.Add("lbId", strconv.Itoa(k8s.LbID))
-
-	resp, err = controller.decortAPICall("POST", LbGetAPI, urlValues)
-	if err != nil {
-		return err
-	}
-
-	var lb LbRecord
-	if err := json.Unmarshal([]byte(resp), &lb); err != nil {
-		return err
-	}
-	d.Set("extnet_id", lb.ExtNetID)
-	d.Set("lb_ip", lb.PrimaryNode.FrontendIP)
-
 	urlValues = &url.Values{}
 	urlValues.Add("k8sId", d.Id())
 	kubeconfig, err := controller.decortAPICall("POST", K8sGetConfigAPI, urlValues)
@@ -167,21 +151,6 @@ func resourceK8sRead(d *schema.ResourceData, m interface{}) error {
 
 	controller := m.(*ControllerCfg)
 	urlValues := &url.Values{}
-	urlValues.Add("lbId", strconv.Itoa(k8s.LbID))
-
-	resp, err := controller.decortAPICall("POST", LbGetAPI, urlValues)
-	if err != nil {
-		return err
-	}
-
-	var lb LbRecord
-	if err := json.Unmarshal([]byte(resp), &lb); err != nil {
-		return err
-	}
-	d.Set("extnet_id", lb.ExtNetID)
-	d.Set("lb_ip", lb.PrimaryNode.FrontendIP)
-
-	urlValues = &url.Values{}
 	urlValues.Add("k8sId", d.Id())
 	kubeconfig, err := controller.decortAPICall("POST", K8sGetConfigAPI, urlValues)
 	if err != nil {
@@ -223,13 +192,15 @@ func resourceK8sUpdate(d *schema.ResourceData, m interface{}) error {
 
 		if newWorkers.Num > wg.Num {
 			urlValues.Add("num", strconv.Itoa(newWorkers.Num-wg.Num))
-			if _, err := controller.decortAPICall("POST", K8sWorkerAddAPI, urlValues); err != nil {
+			_, err := controller.decortAPICall("POST", K8sWorkerAddAPI, urlValues)
+			if err != nil {
 				return err
 			}
 		} else {
 			for i := wg.Num - 1; i >= newWorkers.Num; i-- {
 				urlValues.Set("workerId", strconv.Itoa(wg.DetailedInfo[i].ID))
-				if _, err := controller.decortAPICall("POST", K8sWorkerDeleteAPI, urlValues); err != nil {
+				_, err := controller.decortAPICall("POST", K8sWorkerDeleteAPI, urlValues)
+				if err != nil {
 					return err
 				}
 			}
@@ -332,13 +303,13 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 		//Description: "Create k8s with load balancer if true.",
 		//},
 
-		"extnet_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Computed:    true,
-			ForceNew:    true,
-			Description: "ID of the external network to connect workers to. If omitted network will be chosen by the platfom.",
-		},
+		//"extnet_id": {
+		//Type:        schema.TypeInt,
+		//Optional:    true,
+		//ForceNew:    true,
+		//Default:     0,
+		//Description: "ID of the external network to connect workers to.",
+		//},
 
 		//"desc": {
 		//Type:        schema.TypeString,
@@ -346,12 +317,6 @@ func resourceK8sSchemaMake() map[string]*schema.Schema {
 		//Description: "Text description of this instance.",
 		//},
 
-		"lb_ip": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "IP address of default load balancer.",
-		},
-
 		"default_wg_id": {
 			Type:        schema.TypeInt,
 			Computed:    true,
@@ -381,9 +346,9 @@ func resourceK8s() *schema.Resource {
 		},
 
 		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout20m,
+			Create:  &Timeout10m,
 			Read:    &Timeout30s,
-			Update:  &Timeout20m,
+			Update:  &Timeout10m,
 			Delete:  &Timeout60s,
 			Default: &Timeout60s,
 		},

decort/resource_k8s_wg.go

@@ -108,14 +108,16 @@ func resourceK8sWgUpdate(d *schema.ResourceData, m interface{}) error {
 
 	wg, err := utilityK8sWgCheckPresence(d, m)
 	if err != nil {
-		return err
+		return nil
 	}
 
 	urlValues := &url.Values{}
 	urlValues.Add("k8sId", strconv.Itoa(d.Get("k8s_id").(int)))
 	urlValues.Add("workersGroupId", d.Id())
 
-	if newNum := d.Get("num").(int); newNum > wg.Num {
+	newNum := d.Get("num").(int)
+
+	if newNum > wg.Num {
 		urlValues.Add("num", strconv.Itoa(newNum-wg.Num))
 		_, err := controller.decortAPICall("POST", K8sWorkerAddAPI, urlValues)
 		if err != nil {
@@ -236,9 +238,9 @@ func resourceK8sWg() *schema.Resource {
 		},
 
 		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout20m,
+			Create:  &Timeout10m,
 			Read:    &Timeout30s,
-			Update:  &Timeout20m,
+			Update:  &Timeout10m,
 			Delete:  &Timeout60s,
 			Default: &Timeout60s,
 		},

decort/resource_pcidevice.go

@@ -1,263 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"errors"
-	"net/url"
-	"strconv"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	log "github.com/sirupsen/logrus"
-)
-
-func resourcePcideviceCreate(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourcePcideviceCreate: called for pcidevice %s", d.Get("name").(string))
-
-	if deviceId, ok := d.GetOk("device_id"); ok {
-		if exists, err := resourcePcideviceExists(d, m); exists {
-			if err != nil {
-				return err
-			}
-			d.SetId(strconv.Itoa(deviceId.(int)))
-			err = resourcePcideviceRead(d, m)
-			if err != nil {
-				return err
-			}
-
-			return nil
-		}
-		return errors.New("provided device id does not exist")
-	}
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("name", d.Get("name").(string))
-	urlValues.Add("hwPath", d.Get("hw_path").(string))
-	urlValues.Add("rgId", strconv.Itoa(d.Get("rg_id").(int)))
-	urlValues.Add("stackId", strconv.Itoa(d.Get("stack_id").(int)))
-
-	if description, ok := d.GetOk("description"); ok {
-		urlValues.Add("description", description.(string))
-	}
-
-	pcideviceId, err := controller.decortAPICall("POST", pcideviceCreateAPI, urlValues)
-	if err != nil {
-		return err
-	}
-
-	d.SetId(pcideviceId)
-	d.Set("device_id", pcideviceId)
-
-	err = resourcePcideviceRead(d, m)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func resourcePcideviceRead(d *schema.ResourceData, m interface{}) error {
-	pcidevice, err := utilityPcideviceCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	d.SetId(strconv.Itoa(pcidevice.ID))
-	d.Set("ckey", pcidevice.CKey)
-	d.Set("meta", flattenMeta(pcidevice.Meta))
-	d.Set("compute_id", pcidevice.Computeid)
-	d.Set("description", pcidevice.Description)
-	d.Set("guid", pcidevice.Guid)
-	d.Set("hw_path", pcidevice.HwPath)
-	d.Set("device_id", pcidevice.ID)
-	d.Set("rg_id", pcidevice.RgID)
-	d.Set("name", pcidevice.Name)
-	d.Set("stack_id", pcidevice.StackID)
-	d.Set("status", pcidevice.Status)
-	d.Set("system_name", pcidevice.SystemName)
-
-	return nil
-}
-
-func resourcePcideviceDelete(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourcePcideviceDelete: called for %s, id: %s", d.Get("name").(string), d.Id())
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("deviceId", d.Id())
-	urlValues.Add("force", strconv.FormatBool(d.Get("force").(bool)))
-
-	_, err := controller.decortAPICall("POST", pcideviceDeleteAPI, urlValues)
-	if err != nil {
-		return err
-	}
-
-	d.SetId("")
-
-	return nil
-}
-
-func resourcePcideviceExists(d *schema.ResourceData, m interface{}) (bool, error) {
-	pcidevice, err := utilityPcideviceCheckPresence(d, m)
-	if err != nil {
-		return false, err
-	}
-	if pcidevice == nil {
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func resourcePcideviceEdit(d *schema.ResourceData, m interface{}) error {
-	if d.HasChange("enable") {
-		state := d.Get("enable").(bool)
-		c := m.(*ControllerCfg)
-		urlValues := &url.Values{}
-		api := ""
-
-		urlValues.Add("deviceId", strconv.Itoa(d.Get("device_id").(int)))
-
-		if state {
-			api = pcideviceEnableAPI
-		} else {
-			api = pcideviceDisableAPI
-		}
-
-		_, err := c.decortAPICall("POST", api, urlValues)
-		if err != nil {
-			return err
-		}
-	}
-
-	err := resourcePcideviceRead(d, m)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func resourcePcideviceSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"compute_id": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"description": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
-			Description: "description, just for information",
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"hw_path": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "PCI address of the device",
-		},
-		"device_id": {
-			Type:     schema.TypeInt,
-			Optional: true,
-			Computed: true,
-		},
-		"name": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "Name of Device",
-		},
-		"rg_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "Resource GROUP",
-		},
-		"stack_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "stackId",
-		},
-		"status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"system_name": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"force": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "Force delete",
-		},
-		"enable": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "Enable pci device",
-		},
-	}
-}
-
-func resourcePcidevice() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Create: resourcePcideviceCreate,
-		Read:   resourcePcideviceRead,
-		Update: resourcePcideviceEdit,
-		Delete: resourcePcideviceDelete,
-		Exists: resourcePcideviceExists,
-
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout60s,
-			Read:    &Timeout30s,
-			Update:  &Timeout60s,
-			Delete:  &Timeout60s,
-			Default: &Timeout60s,
-		},
-
-		Schema: resourcePcideviceSchemaMake(),
-	}
-}

decort/resource_pfw.go

@@ -145,7 +145,6 @@ func resourcePfwSchemaMake() map[string]*schema.Schema {
 		"public_port_end": {
 			Type:         schema.TypeInt,
 			Optional:     true,
-			Computed:     true,
 			ForceNew:     true,
 			ValidateFunc: validation.IntBetween(1, 65535),
 			Description:  "End port number (inclusive) for the ranged rule.",

decort/resource_rg.go

@@ -24,7 +24,6 @@ Visit https://github.com/rudecs/terraform-provider-decort for full source code p
 package decort
 
 import (
-	"encoding/json"
 	"fmt"
 	"net/url"
 
@@ -39,6 +38,10 @@ func resourceResgroupCreate(d *schema.ResourceData, m interface{}) error {
 
 	// Valid account ID is required to create new resource group
 	// obtain Account ID by account name - it should not be zero on success
+	validated_account_id, err := utilityGetAccountIdBySchema(d, m)
+	if err != nil {
+		return err
+	}
 
 	rg_name, arg_set := d.GetOk("name")
 	if !arg_set {
@@ -58,7 +61,7 @@ func resourceResgroupCreate(d *schema.ResourceData, m interface{}) error {
 
 	// all required parameters are set in the schema - we can continue with RG creation
 	log.Debugf("resourceResgroupCreate: called for RG name %s, account ID %d",
-		rg_name.(string), d.Get("account_id").(int))
+		rg_name.(string), validated_account_id)
 
 	// quota settings are optional
 	set_quota := false
@@ -66,17 +69,17 @@ func resourceResgroupCreate(d *schema.ResourceData, m interface{}) error {
 	arg_value, arg_set := d.GetOk("quota")
 	if arg_set {
 		log.Debugf("resourceResgroupCreate: setting Quota on RG requested")
-		quota_record = makeQuotaRecord(arg_value.([]interface{}))
+		quota_record, _ = makeQuotaRecord(arg_value.([]interface{}))
 		set_quota = true
 	}
 
 	controller := m.(*ControllerCfg)
 	log.Debugf("resourceResgroupCreate: called by user %q for RG name %s, account ID %d",
 		controller.getDecortUsername(),
-		rg_name.(string), d.Get("account_id").(int))
+		rg_name.(string), validated_account_id)
 
 	url_values := &url.Values{}
-	url_values.Add("accountId", fmt.Sprintf("%d", d.Get("account_id").(int)))
+	url_values.Add("accountId", fmt.Sprintf("%d", validated_account_id))
 	url_values.Add("name", rg_name.(string))
 	url_values.Add("gid", fmt.Sprintf("%d", DefaultGridID)) // use default Grid ID, similar to disk resource mgmt convention
 	url_values.Add("owner", controller.getDecortUsername())
@@ -119,28 +122,15 @@ func resourceResgroupCreate(d *schema.ResourceData, m interface{}) error {
 
 	d.SetId(api_resp) // rg/create API returns ID of the newly creted resource group on success
 	// rg.ID, _ = strconv.Atoi(api_resp)
-	if !set_quota {
-		resp, err := utilityResgroupCheckPresence(d, m)
-		if err != nil {
-			return err
-		}
-
-		rg := ResgroupGetResp{}
-		if err := json.Unmarshal([]byte(resp), &rg); err != nil {
-			return err
-		}
-
-		d.Set("quota", parseQuota(rg.Quota))
-	}
 
 	// re-read newly created RG to make sure schema contains complete and up to date set of specifications
 	return resourceResgroupRead(d, m)
 }
 
 func resourceResgroupRead(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceResgroupRead: called for RG name %s, account ID %d",
+	log.Debugf("resourceResgroupRead: called for RG name %s, account ID %s",
 		d.Get("name").(string), d.Get("account_id").(int))
-
+		
 	rg_facts, err := utilityResgroupCheckPresence(d, m)
 	if rg_facts == "" {
 		// if empty string is returned from utilityResgroupCheckPresence then there is no
@@ -175,8 +165,9 @@ func resourceResgroupUpdate(d *schema.ResourceData, m interface{}) error {
 	if attr_new.(int) != attr_old.(int) {
 		return fmt.Errorf("resourceResgroupUpdate: RG ID %s: changing ext_net_id for existing RG is not allowed", d.Id())
 	}
+	
 
-	do_general_update := false // will be true if general RG update is necessary (API rg/update)
+	do_general_update := false      // will be true if general RG update is necessary (API rg/update)
 
 	controller := m.(*ControllerCfg)
 	url_values := &url.Values{}
@@ -195,9 +186,9 @@ func resourceResgroupUpdate(d *schema.ResourceData, m interface{}) error {
 	quota_value, quota_set := d.GetOk("quota")
 	if quota_set {
 		log.Debugf("resourceResgroupUpdate: quota specified - looking for deltas from the old quota.")
-		quotarecord_new := makeQuotaRecord(quota_value.([]interface{}))
+		quotarecord_new, _ := makeQuotaRecord(quota_value.([]interface{}))
 		quota_value_old, _ := d.GetChange("quota") // returns old as 1st, new as 2nd return value
-		quotarecord_old := makeQuotaRecord(quota_value_old.([]interface{}))
+		quotarecord_old, _ := makeQuotaRecord(quota_value_old.([]interface{}))
 
 		if quotarecord_new.Cpu != quotarecord_old.Cpu {
 			do_general_update = true
@@ -256,14 +247,11 @@ func resourceResgroupUpdate(d *schema.ResourceData, m interface{}) error {
 func resourceResgroupDelete(d *schema.ResourceData, m interface{}) error {
 	// NOTE: this method forcibly destroys target resource group with flag "permanently", so there is no way to
 	// restore the destroyed resource group as well all Computes & VINSes that existed in it
-	log.Debugf("resourceResgroupDelete: called for RG name %s, account ID %d",
+	log.Debugf("resourceResgroupDelete: called for RG name %s, account ID %s",
 		d.Get("name").(string), d.Get("account_id").(int))
 
 	rg_facts, err := utilityResgroupCheckPresence(d, m)
 	if rg_facts == "" {
-		if err != nil {
-			return err
-		}
 		// the target RG does not exist - in this case according to Terraform best practice
 		// we exit from Destroy method without error
 		return nil
@@ -326,18 +314,18 @@ func resourceResgroup() *schema.Resource {
 			},
 
 			"account_id": {
-				Type:         schema.TypeInt,
-				Required:     true,
+				Type:        schema.TypeInt,
+				Required:    true,
 				ValidateFunc: validation.IntAtLeast(1),
-				Description:  "Unique ID of the account, which this resource group belongs to.",
+				Description: "Unique ID of the account, which this resource group belongs to.",
 			},
 
 			"def_net_type": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				Default:      "PRIVATE",
+				Type:        schema.TypeString,
+				Optional:    true,
+				Default:     "PRIVATE",
 				ValidateFunc: validation.StringInSlice([]string{"PRIVATE", "PUBLIC", "NONE"}, false),
-				Description:  "Type of the network, which this resource group will use as default for its computes - PRIVATE or PUBLIC or NONE.",
+				Description: "Type of the network, which this resource group will use as default for its computes - PRIVATE or PUBLIC or NONE.",
 			},
 
 			"def_net_id": {
@@ -366,7 +354,7 @@ func resourceResgroup() *schema.Resource {
 			},
 
 			/* commented out, as in this version of provider we use default Grid ID
-			"grid_id": {
+			"grid_id": { 
 				Type:        schema.TypeInt,
 				Optional:    true,
 				Default:     0,     // if 0 is passed, default Grid ID will be used
@@ -379,7 +367,6 @@ func resourceResgroup() *schema.Resource {
 			"quota": {
 				Type:     schema.TypeList,
 				Optional: true,
-				Computed: true,
 				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: quotaRgSubresourceSchemaMake(),
@@ -400,30 +387,30 @@ func resourceResgroup() *schema.Resource {
 			},
 
 			/*
-				"status": {
-					Type:        schema.TypeString,
-					Computed:    true,
-					Description: "Current status of this resource group.",
-				},
+			"status": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Current status of this resource group.",
+			},
 
-				"vins": {
-					Type:     schema.TypeList, // this is a list of ints
-					Computed: true,
-					MaxItems: LimitMaxVinsPerResgroup,
-					Elem: &schema.Schema{
-						Type: schema.TypeInt,
-					},
-					Description: "List of VINs deployed in this resource group.",
+			"vins": {
+				Type:     schema.TypeList, // this is a list of ints
+				Computed: true,
+				MaxItems: LimitMaxVinsPerResgroup,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
 				},
+				Description: "List of VINs deployed in this resource group.",
+			},
 
-				"computes": {
-					Type:     schema.TypeList, // this is a list of ints
-					Computed: true,
-					Elem: &schema.Schema{
-						Type: schema.TypeInt,
-					},
-					Description: "List of computes deployed in this resource group.",
+			"computes": {
+				Type:     schema.TypeList, // this is a list of ints
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
 				},
+				Description: "List of computes deployed in this resource group.",
+			},
 			*/
 		},
 	}

decort/resource_sep.go

@@ -1,548 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"errors"
-	"net/url"
-	"strconv"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/customdiff"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	log "github.com/sirupsen/logrus"
-)
-
-func resourceSepCreate(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceSepCreate: called for sep %s", d.Get("name").(string))
-
-	if sepId, ok := d.GetOk("sep_id"); ok {
-		if exists, err := resourceSepExists(d, m); exists {
-			if err != nil {
-				return err
-			}
-			d.SetId(strconv.Itoa(sepId.(int)))
-			err = resourceSepRead(d, m)
-			if err != nil {
-				return err
-			}
-
-			return nil
-		}
-		return errors.New("provided sep id does not exist")
-	}
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("name", d.Get("name").(string))
-	urlValues.Add("gid", strconv.Itoa(d.Get("gid").(int)))
-	urlValues.Add("sep_type", d.Get("type").(string))
-
-	if desc, ok := d.GetOk("desc"); ok {
-		urlValues.Add("description", desc.(string))
-	}
-	if configString, ok := d.GetOk("config"); ok {
-		urlValues.Add("config", configString.(string))
-	}
-	if enable, ok := d.GetOk("enable"); ok {
-		urlValues.Add("enable", strconv.FormatBool(enable.(bool)))
-	}
-
-	tstr := d.Get("consumed_by").([]interface{})
-	temp := ""
-	l := len(tstr)
-	for i, str := range tstr {
-		s := "\"" + str.(string) + "\""
-		if i != (l - 1) {
-			s += ","
-		}
-		temp = temp + s
-	}
-	temp = "[" + temp + "]"
-	urlValues.Add("consumer_nids", temp)
-
-	tstr = d.Get("provided_by").([]interface{})
-	temp = ""
-	l = len(tstr)
-	for i, str := range tstr {
-		s := "\"" + str.(string) + "\""
-		if i != (l - 1) {
-			s += ","
-		}
-		temp = temp + s
-	}
-	temp = "[" + temp + "]"
-	urlValues.Add("provider_nids", temp)
-
-	sepId, err := controller.decortAPICall("POST", sepCreateAPI, urlValues)
-	if err != nil {
-		return err
-	}
-
-	id := uuid.New()
-	d.SetId(sepId)
-	d.Set("sep_id", sepId)
-
-	err = resourceSepRead(d, m)
-	if err != nil {
-		return err
-	}
-
-	d.SetId(id.String())
-
-	return nil
-}
-
-func resourceSepRead(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceSepRead: called for %s id: %d", d.Get("name").(string), d.Get("sep_id").(int))
-
-	sep, err := utilitySepCheckPresence(d, m)
-	if sep == nil {
-		d.SetId("")
-		return err
-	}
-
-	d.Set("ckey", sep.Ckey)
-	d.Set("meta", flattenMeta(sep.Meta))
-	d.Set("consumed_by", sep.ConsumedBy)
-	d.Set("desc", sep.Desc)
-	d.Set("gid", sep.Gid)
-	d.Set("guid", sep.Guid)
-	d.Set("sep_id", sep.Id)
-	d.Set("milestones", sep.Milestones)
-	d.Set("name", sep.Name)
-	d.Set("obj_status", sep.ObjStatus)
-	d.Set("provided_by", sep.ProvidedBy)
-	d.Set("tech_status", sep.TechStatus)
-	d.Set("type", sep.Type)
-	data, _ := json.Marshal(sep.Config)
-	d.Set("config", string(data))
-
-	return nil
-}
-
-func resourceSepDelete(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceSepDelete: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
-
-	sepDes, err := utilitySepCheckPresence(d, m)
-	if sepDes == nil {
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
-
-	_, err = controller.decortAPICall("POST", sepDeleteAPI, urlValues)
-	if err != nil {
-		return err
-	}
-	d.SetId("")
-
-	return nil
-}
-
-func resourceSepExists(d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceSepExists: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
-
-	sepDes, err := utilitySepCheckPresence(d, m)
-	if sepDes == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func resourceSepEdit(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceSepEdit: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
-	c := m.(*ControllerCfg)
-
-	urlValues := &url.Values{}
-	if d.HasChange("decommission") {
-		decommission := d.Get("decommission").(bool)
-		if decommission {
-			urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
-			urlValues.Add("clear_physically", strconv.FormatBool(d.Get("clear_physically").(bool)))
-			_, err := c.decortAPICall("POST", sepDecommissionAPI, urlValues)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	urlValues = &url.Values{}
-	if d.HasChange("upd_capacity_limit") {
-		updCapacityLimit := d.Get("upd_capacity_limit").(bool)
-		if updCapacityLimit {
-			urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
-			_, err := c.decortAPICall("POST", sepUpdateCapacityLimitAPI, urlValues)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	urlValues = &url.Values{}
-	if d.HasChange("config") {
-		urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
-		urlValues.Add("config", d.Get("config").(string))
-		_, err := c.decortAPICall("POST", sepConfigValidateAPI, urlValues)
-		if err != nil {
-			return err
-		}
-		_, err = c.decortAPICall("POST", sepConfigInsertAPI, urlValues)
-		if err != nil {
-			return err
-		}
-
-	}
-
-	urlValues = &url.Values{}
-	if d.HasChange("field_edit") {
-		fieldConfig := d.Get("field_edit").([]interface{})
-		field := fieldConfig[0].(map[string]interface{})
-		urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
-		urlValues.Add("field_name", field["field_name"].(string))
-		urlValues.Add("field_value", field["field_value"].(string))
-		urlValues.Add("field_type", field["field_type"].(string))
-
-		_, err := c.decortAPICall("POST", sepConfigFieldEditAPI, urlValues)
-		if err != nil {
-			return err
-		}
-	}
-
-	urlValues = &url.Values{}
-	if err := resourceSepRead(d, m); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func resourceSepChangeEnabled(d *schema.ResourceDiff, m interface{}) error {
-	var api string
-
-	c := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
-	if d.Get("enable").(bool) {
-		api = sepEnableAPI
-	} else {
-		api = sepDisableAPI
-	}
-	resp, err := c.decortAPICall("POST", api, urlValues)
-	if err != nil {
-		return err
-	}
-	res, err := strconv.ParseBool(resp)
-	if err != nil {
-		return err
-	}
-	if !res {
-		return errors.New("Cannot enable/disable")
-	}
-	return nil
-}
-
-func resourceSepUpdateNodes(d *schema.ResourceDiff, m interface{}) error {
-	log.Debugf("resourceSepUpdateNodes: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
-	c := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	t1, t2 := d.GetChange("consumed_by")
-
-	urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
-
-	consumedIds := make([]interface{}, 0)
-	temp := ""
-	api := ""
-
-	if d1, d2 := t1.([]interface{}), t2.([]interface{}); len(d1) > len(d2) {
-		for _, n := range d2 {
-			if !findElInt(d1, n) {
-				consumedIds = append(consumedIds, n)
-			}
-		}
-		api = sepDelConsumerNodesAPI
-	} else {
-		consumedIds = d.Get("consumed_by").([]interface{})
-		api = sepAddConsumerNodesAPI
-	}
-
-	l := len(consumedIds)
-	for i, consumedId := range consumedIds {
-		s := strconv.Itoa(consumedId.(int))
-		if i != (l - 1) {
-			s += ","
-		}
-		temp = temp + s
-	}
-	temp = "[" + temp + "]"
-	urlValues.Add("consumer_nids", temp)
-	_, err := c.decortAPICall("POST", api, urlValues)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func findElInt(sl []interface{}, el interface{}) bool {
-	for _, e := range sl {
-		if e.(int) == el.(int) {
-			return true
-		}
-	}
-	return false
-}
-
-func resourceSepUpdateProviders(d *schema.ResourceDiff, m interface{}) error {
-	log.Debugf("resourceSepUpdateProviders: called for %s, id: %d", d.Get("name").(string), d.Get("sep_id").(int))
-	c := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
-	providerIds := d.Get("provided_by").([]interface{})
-	temp := ""
-	l := len(providerIds)
-	for i, providerId := range providerIds {
-		s := strconv.Itoa(providerId.(int))
-		if i != (l - 1) {
-			s += ","
-		}
-		temp = temp + s
-	}
-	temp = "[" + temp + "]"
-	urlValues.Add("provider_nids", temp)
-	_, err := c.decortAPICall("POST", sepAddProviderNodesAPI, urlValues)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func resourceSepSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"sep_id": {
-			Type:        schema.TypeInt,
-			Optional:    true,
-			Computed:    true,
-			Description: "sep type des id",
-		},
-		"upd_capacity_limit": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "Update SEP capacity limit",
-		},
-		"decommission": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "unlink everything that exists from SEP",
-		},
-		"clear_physically": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     true,
-			Description: "clear disks and images physically",
-		},
-		"config": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			Computed:    true,
-			Description: "sep config string",
-		},
-		"ckey": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"meta": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeString,
-			},
-		},
-		"consumed_by": {
-			Type:     schema.TypeList,
-			Optional: true,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-			Description: "list of consumer nodes IDs",
-		},
-		"desc": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Optional:    true,
-			Description: "sep description",
-		},
-		"gid": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			Description: "grid (platform) ID",
-		},
-		"guid": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"milestones": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"name": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "SEP name",
-		},
-		"obj_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"provided_by": {
-			Type:     schema.TypeList,
-			Optional: true,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-			Description: "list of provider nodes IDs",
-		},
-		"tech_status": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"type": {
-			Type:        schema.TypeString,
-			Required:    true,
-			Description: "type of storage",
-		},
-		"enable": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "enable SEP after creation",
-		},
-		"field_edit": {
-			Type:     schema.TypeList,
-			MaxItems: 1,
-			Optional: true,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"field_name": {
-						Type:     schema.TypeString,
-						Required: true,
-					},
-					"field_value": {
-						Type:     schema.TypeString,
-						Required: true,
-					},
-					"field_type": {
-						Type:     schema.TypeString,
-						Required: true,
-					},
-				},
-			},
-		},
-	}
-}
-
-func resourceSep() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Create: resourceSepCreate,
-		Read:   resourceSepRead,
-		Update: resourceSepEdit,
-		Delete: resourceSepDelete,
-		Exists: resourceSepExists,
-
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout60s,
-			Read:    &Timeout30s,
-			Update:  &Timeout60s,
-			Delete:  &Timeout60s,
-			Default: &Timeout60s,
-		},
-
-		Schema: resourceSepSchemaMake(),
-
-		CustomizeDiff: customdiff.All(
-			customdiff.IfValueChange("enable", func(old, new, meta interface{}) bool {
-				return old.(bool) != new.(bool)
-			}, resourceSepChangeEnabled),
-			customdiff.IfValueChange("consumed_by", func(old, new, meta interface{}) bool {
-				o := old.([]interface{})
-				n := new.([]interface{})
-
-				if len(o) != len(n) {
-					return true
-				} else if len(o) == 0 {
-					return false
-				}
-				count := 0
-				for i, v := range n {
-					if v.(int) == o[i].(int) {
-						count++
-					}
-				}
-				return count == 0
-			}, resourceSepUpdateNodes),
-			customdiff.IfValueChange("provided_by", func(old, new, meta interface{}) bool {
-				o := old.([]interface{})
-				n := new.([]interface{})
-
-				if len(o) != len(n) {
-					return true
-				} else if len(o) == 0 {
-					return false
-				}
-				count := 0
-				for i, v := range n {
-					if v.(int) == o[i].(int) {
-						count++
-					}
-				}
-				return count == 0
-			}, resourceSepUpdateProviders),
-		),
-	}
-}

decort/resource_sep_config.go

@@ -1,195 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"errors"
-	"net/url"
-	"strconv"
-
-	"github.com/google/uuid"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	log "github.com/sirupsen/logrus"
-)
-
-func resourceSepConfigCreate(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceSepConfigCreate: called for sep id %d", d.Get("sep_id").(int))
-
-	if _, ok := d.GetOk("sep_id"); ok {
-		if exists, err := resourceSepConfigExists(d, m); exists {
-			if err != nil {
-				return err
-			}
-			id := uuid.New()
-			d.SetId(id.String())
-			err = resourceSepConfigRead(d, m)
-			if err != nil {
-				return err
-			}
-
-			return nil
-		}
-		return errors.New("provided sep id config does not exist")
-	}
-
-	return resourceSepConfigRead(d, m)
-}
-
-func resourceSepConfigRead(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceSepConfigRead: called for sep id: %d", d.Get("sep_id").(int))
-
-	sepConfig, err := utilitySepConfigCheckPresence(d, m)
-	if sepConfig == nil {
-		d.SetId("")
-		return err
-	}
-	data, _ := json.Marshal(sepConfig)
-	d.Set("config", string(data))
-	return nil
-}
-
-func resourceSepConfigDelete(d *schema.ResourceData, m interface{}) error {
-	d.SetId("")
-	return nil
-}
-
-func resourceSepConfigExists(d *schema.ResourceData, m interface{}) (bool, error) {
-	log.Debugf("resourceSepConfigExists: called for sep id: %d", d.Get("sep_id").(int))
-
-	sepDesConfig, err := utilitySepConfigCheckPresence(d, m)
-	if sepDesConfig == nil {
-		if err != nil {
-			return false, err
-		}
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func resourceSepConfigEdit(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceSepConfigEdit: called for sep id: %d", d.Get("sep_id").(int))
-	c := m.(*ControllerCfg)
-
-	urlValues := &url.Values{}
-	if d.HasChange("config") {
-		urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
-		urlValues.Add("config", d.Get("config").(string))
-		_, err := c.decortAPICall("POST", sepConfigValidateAPI, urlValues)
-		if err != nil {
-			return err
-		}
-		_, err = c.decortAPICall("POST", sepConfigInsertAPI, urlValues)
-		if err != nil {
-			return err
-		}
-
-	}
-
-	urlValues = &url.Values{}
-	if d.HasChange("field_edit") {
-		fieldConfig := d.Get("field_edit").([]interface{})
-		field := fieldConfig[0].(map[string]interface{})
-		urlValues.Add("sep_id", strconv.Itoa(d.Get("sep_id").(int)))
-		urlValues.Add("field_name", field["field_name"].(string))
-		urlValues.Add("field_value", field["field_value"].(string))
-		urlValues.Add("field_type", field["field_type"].(string))
-
-		_, err := c.decortAPICall("POST", sepConfigFieldEditAPI, urlValues)
-		if err != nil {
-			return err
-		}
-	}
-
-	err := resourceSepConfigRead(d, m)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func resourceSepConfigSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"sep_id": {
-			Type:     schema.TypeInt,
-			Required: true,
-		},
-		"config": {
-			Type:     schema.TypeString,
-			Optional: true,
-			Computed: true,
-		},
-		"field_edit": {
-			Type:     schema.TypeList,
-			MaxItems: 1,
-			Optional: true,
-			Computed: true,
-			Elem: &schema.Resource{
-				Schema: map[string]*schema.Schema{
-					"field_name": {
-						Type:     schema.TypeString,
-						Required: true,
-					},
-					"field_value": {
-						Type:     schema.TypeString,
-						Required: true,
-					},
-					"field_type": {
-						Type:     schema.TypeString,
-						Required: true,
-					},
-				},
-			},
-		},
-	}
-}
-
-func resourceSepConfig() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Create: resourceSepConfigCreate,
-		Read:   resourceSepConfigRead,
-		Update: resourceSepConfigEdit,
-		Delete: resourceSepConfigDelete,
-		Exists: resourceSepConfigExists,
-
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout60s,
-			Read:    &Timeout30s,
-			Update:  &Timeout60s,
-			Delete:  &Timeout60s,
-			Default: &Timeout60s,
-		},
-
-		Schema: resourceSepConfigSchemaMake(),
-	}
-}

decort/resource_snapshot.go

@@ -1,203 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"net/url"
-	"strconv"
-	"strings"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/customdiff"
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-	log "github.com/sirupsen/logrus"
-)
-
-func resourceSnapshotCreate(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceSnapshotCreate: called for snapshot %s", d.Get("label").(string))
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("label", d.Get("label").(string))
-	urlValues.Add("computeId", strconv.Itoa(d.Get("compute_id").(int)))
-
-	snapshotId, err := controller.decortAPICall("POST", snapshotCreateAPI, urlValues)
-	if err != nil {
-		return err
-	}
-
-	snapshotId = strings.ReplaceAll(snapshotId, "\"", "")
-
-	d.SetId(snapshotId)
-	d.Set("guid", snapshotId)
-
-	err = resourceSnapshotRead(d, m)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func resourceSnapshotRead(d *schema.ResourceData, m interface{}) error {
-	snapshot, err := utilitySnapshotCheckPresence(d, m)
-	if err != nil {
-		return err
-	}
-
-	d.Set("timestamp", snapshot.Timestamp)
-	d.Set("guid", snapshot.Guid)
-	d.Set("disks", snapshot.Disks)
-	d.Set("label", snapshot.Label)
-
-	return nil
-}
-
-func resourceSnapshotDelete(d *schema.ResourceData, m interface{}) error {
-	log.Debugf("resourceSnapshotDelete: called for %s, id: %s", d.Get("label").(string), d.Id())
-
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-	urlValues.Add("computeId", strconv.Itoa(d.Get("compute_id").(int)))
-	urlValues.Add("label", d.Get("label").(string))
-
-	_, err := controller.decortAPICall("POST", snapshotDeleteAPI, urlValues)
-	if err != nil {
-		return err
-	}
-	d.SetId("")
-
-	return nil
-}
-
-func resourceSnapshotExists(d *schema.ResourceData, m interface{}) (bool, error) {
-	snapshot, err := utilitySnapshotCheckPresence(d, m)
-	if err != nil {
-		return false, err
-	}
-	if snapshot == nil {
-		return false, nil
-	}
-
-	return true, nil
-}
-
-func resourceSnapshotEdit(d *schema.ResourceData, m interface{}) error {
-	err := resourceSnapshotRead(d, m)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func resourceSnapshotRollback(d *schema.ResourceDiff, m interface{}) error {
-	c := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("computeId", strconv.Itoa(d.Get("compute_id").(int)))
-	urlValues.Add("label", d.Get("label").(string))
-
-	_, err := c.decortAPICall("POST", snapshotRollbackAPI, urlValues)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func resourceSnapshotSchemaMake() map[string]*schema.Schema {
-	return map[string]*schema.Schema{
-		"compute_id": {
-			Type:        schema.TypeInt,
-			Required:    true,
-			ForceNew:    true,
-			Description: "ID of the compute instance to create snapshot for.",
-		},
-		"label": {
-			Type:        schema.TypeString,
-			Required:    true,
-			ForceNew:    true,
-			Description: "text label for snapshot. Must be unique among this compute snapshots.",
-		},
-		"rollback": {
-			Type:        schema.TypeBool,
-			Optional:    true,
-			Default:     false,
-			Description: "is rollback the snapshot",
-		},
-		"disks": {
-			Type:     schema.TypeList,
-			Computed: true,
-			Elem: &schema.Schema{
-				Type: schema.TypeInt,
-			},
-		},
-		"guid": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "guid of the snapshot",
-		},
-		"timestamp": {
-			Type:        schema.TypeInt,
-			Computed:    true,
-			Description: "timestamp",
-		},
-	}
-}
-
-func resourceSnapshot() *schema.Resource {
-	return &schema.Resource{
-		SchemaVersion: 1,
-
-		Create: resourceSnapshotCreate,
-		Read:   resourceSnapshotRead,
-		Update: resourceSnapshotEdit,
-		Delete: resourceSnapshotDelete,
-		Exists: resourceSnapshotExists,
-
-		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
-		},
-
-		Timeouts: &schema.ResourceTimeout{
-			Create:  &Timeout60s,
-			Read:    &Timeout30s,
-			Update:  &Timeout60s,
-			Delete:  &Timeout60s,
-			Default: &Timeout60s,
-		},
-
-		CustomizeDiff: customdiff.All(
-			customdiff.IfValueChange("rollback", func(old, new, meta interface{}) bool {
-				o := old.(bool)
-				if o != new.(bool) && !o {
-					return true
-				}
-				return false
-			}, resourceSnapshotRollback),
-		),
-
-		Schema: resourceSnapshotSchemaMake(),
-	}
-}

decort/resource_vins.go

@@ -40,7 +40,7 @@ import (
 func ipcidrDiffSupperss(key, oldVal, newVal string, d *schema.ResourceData) bool {
 	if oldVal == "" && newVal != "" {
 		// if old value for "ipcidr" resource is empty string, it means that we are creating new ViNS
-		// and there is a chance that the user will want specific IP address range for this ViNS -
+		// and there is a chance that the user will want specific IP address range for this ViNS -  
 		// check if "ipcidr" is explicitly set in TF file to a non-empty string.
 		log.Debugf("ipcidrDiffSupperss: key=%s, oldVal=%q, newVal=%q -> suppress=FALSE", key, oldVal, newVal)
 		return false // there is a difference between stored and new value
@@ -51,7 +51,7 @@ func ipcidrDiffSupperss(key, oldVal, newVal string, d *schema.ResourceData) bool
 
 func resourceVinsCreate(d *schema.ResourceData, m interface{}) error {
 	log.Debugf("resourceVinsCreate: called for ViNS name %s, Account ID %d, RG ID %d",
-		d.Get("name").(string), d.Get("account_id").(int), d.Get("rg_id").(int))
+	           d.Get("name").(string), d.Get("account_id").(int), d.Get("rg_id").(int))
 
 	apiToCall := VinsCreateInAccountAPI
 
@@ -65,7 +65,7 @@ func resourceVinsCreate(d *schema.ResourceData, m interface{}) error {
 		apiToCall = VinsCreateInRgAPI
 		urlValues.Add("rgId", fmt.Sprintf("%d", argVal.(int)))
 	} else {
-		// RG ID either not set at all or set to 0 - user may want ViNS at account level
+		// RG ID either not set at all or set to 0 - user may want ViNS at account level 
 		argVal, argSet = d.GetOk("account_id")
 		if !argSet || argVal.(int) <= 0 {
 			// No valid Account ID (and no RG ID either) - cannot create ViNS
@@ -79,14 +79,14 @@ func resourceVinsCreate(d *schema.ResourceData, m interface{}) error {
 		if argVal.(int) > 0 {
 			// connect to specific external network
 			urlValues.Add("extNetId", fmt.Sprintf("%d", argVal.(int)))
-			/*
-				 Commented out, as we've made "ext_net_ip" parameter non-configurable via Terraform!
+			/* 
+			 Commented out, as we've made "ext_net_ip" parameter non-configurable via Terraform!
 
-				// in case of specific ext net connection user may also want a particular IP address
-				argVal, argSet = d.GetOk("ext_net_ip")
-				if argSet && argVal.(string) != "" {
-					urlValues.Add("extIp", argVal.(string))
-				}
+			// in case of specific ext net connection user may also want a particular IP address
+			argVal, argSet = d.GetOk("ext_net_ip")
+			if argSet && argVal.(string) != "" {
+				urlValues.Add("extIp", argVal.(string))
+			}
 			*/
 		} else {
 			// ext_net_id is set to a negative value - connect to default external network
@@ -100,7 +100,7 @@ func resourceVinsCreate(d *schema.ResourceData, m interface{}) error {
 		log.Debugf("resourceVinsCreate: ipcidr is set to %s", argVal.(string))
 		urlValues.Add("ipcidr", argVal.(string))
 	}
-
+	
 	argVal, argSet = d.GetOk("description")
 	if argSet {
 		urlValues.Add("desc", argVal.(string))
@@ -116,9 +116,9 @@ func resourceVinsCreate(d *schema.ResourceData, m interface{}) error {
 
 	log.Debugf("resourceVinsCreate: new ViNS ID / name %d / %s creation sequence complete", vinsId, d.Get("name").(string))
 
-	// We may reuse dataSourceVinsRead here as we maintain similarity
+	// We may reuse dataSourceVinsRead here as we maintain similarity 
 	// between ViNS resource and ViNS data source schemas
-	// ViNS resource read function will also update resource ID on success, so that Terraform
+	// ViNS resource read function will also update resource ID on success, so that Terraform 
 	// will know the resource exists (however, we already did it a few lines before)
 	return dataSourceVinsRead(d, m)
 }
@@ -138,12 +138,12 @@ func resourceVinsRead(d *schema.ResourceData, m interface{}) error {
 func resourceVinsUpdate(d *schema.ResourceData, m interface{}) error {
 
 	log.Debugf("resourceVinsUpdate: called for ViNS ID / name %s / %s,  Account ID %d, RG ID %d",
-		d.Id(), d.Get("name").(string), d.Get("account_id").(int), d.Get("rg_id").(int))
+		d.Id(), d.Get("name").(string), d.Get("account_id").(int),  d.Get("rg_id").(int))
 
 	controller := m.(*ControllerCfg)
 
 	d.Partial(true)
-
+	
 	// 1. Handle external network connection change
 	oldExtNetId, newExtNedId := d.GetChange("ext_net_id")
 	if oldExtNetId.(int) != newExtNedId.(int) {
@@ -168,15 +168,15 @@ func resourceVinsUpdate(d *schema.ResourceData, m interface{}) error {
 				return err
 			}
 		}
-
+		
 		d.SetPartial("ext_net_id")
 	}
 
 	d.Partial(false)
 
-	// we may reuse dataSourceVinsRead here as we maintain similarity
+	// we may reuse dataSourceVinsRead here as we maintain similarity 
 	// between Compute resource and Compute data source schemas
-	return dataSourceVinsRead(d, m)
+	return dataSourceVinsRead(d, m) 
 }
 
 func resourceVinsDelete(d *schema.ResourceData, m interface{}) error {
@@ -185,9 +185,6 @@ func resourceVinsDelete(d *schema.ResourceData, m interface{}) error {
 
 	vinsFacts, err := utilityVinsCheckPresence(d, m)
 	if vinsFacts == "" {
-		if err != nil {
-			return err
-		}
 		// the specified ViNS does not exist - in this case according to Terraform best practice
 		// we exit from Destroy method without error
 		return nil
@@ -195,8 +192,8 @@ func resourceVinsDelete(d *schema.ResourceData, m interface{}) error {
 
 	params := &url.Values{}
 	params.Add("vinsId", d.Id())
-	params.Add("force", "1")       // disconnect all computes before deleting ViNS
-	params.Add("permanently", "1") // delete ViNS immediately bypassing recycle bin
+	params.Add("force", "1")        // disconnect all computes before deleting ViNS
+	params.Add("permanently", "1")  // delete ViNS immediately bypassing recycle bin
 
 	controller := m.(*ControllerCfg)
 	_, err = controller.decortAPICall("POST", VinsDeleteAPI, params)
@@ -225,10 +222,10 @@ func resourceVinsExists(d *schema.ResourceData, m interface{}) (bool, error) {
 func resourceVinsSchemaMake() map[string]*schema.Schema {
 	rets := map[string]*schema.Schema{
 		"name": {
-			Type:         schema.TypeString,
-			Required:     true,
+			Type:        schema.TypeString,
+			Required:    true,
 			ValidateFunc: validation.StringIsNotEmpty,
-			Description:  "Name of the ViNS. Names are case sensitive and unique within the context of an account or resource group.",
+			Description: "Name of the ViNS. Names are case sensitive and unique within the context of an account or resource group.",
 		},
 
 		/* we do not need ViNS ID as an argument because if we already know this ID, it is not practical to call resource provider.
@@ -249,25 +246,25 @@ func resourceVinsSchemaMake() map[string]*schema.Schema {
 		},
 
 		"account_id": {
-			Type:         schema.TypeInt,
-			Required:     true,
-			ForceNew:     true,
+			Type:        schema.TypeInt,
+			Required:    true,
+			ForceNew:    true,
 			ValidateFunc: validation.IntAtLeast(1),
-			Description:  "ID of the account, which this ViNS belongs to. For ViNS created at account level, resource group ID is 0.",
+			Description: "ID of the account, which this ViNS belongs to. For ViNS created at account level, resource group ID is 0.",
 		},
 
 		"ext_net_id": {
-			Type:         schema.TypeInt,
-			Required:     true,
+			Type:        schema.TypeInt,
+			Required:    true,
 			ValidateFunc: validation.IntAtLeast(0),
-			Description:  "ID of the external network this ViNS is connected to. Pass 0 if no external connection required.",
+			Description: "ID of the external network this ViNS is connected to. Pass 0 if no external connection required.",
 		},
 
 		"ipcidr": {
-			Type:             schema.TypeString,
-			Optional:         true,
+			Type:        schema.TypeString,
+			Optional:    true,
 			DiffSuppressFunc: ipcidrDiffSupperss,
-			Description:      "Network address to use by this ViNS. This parameter is only valid when creating new ViNS.",
+			Description: "Network address to use by this ViNS. This parameter is only valid when creating new ViNS.",
 		},
 
 		"description": {

decort/resource_virtual_image.go

@@ -332,13 +332,22 @@ func resourceVirtualImage() *schema.Resource {
 
 		CustomizeDiff: customdiff.All(
 			customdiff.IfValueChange("enabled", func(old, new, meta interface{}) bool {
-				return old.(bool) != new.(bool)
+				if old.(bool) != new.(bool) {
+					return true
+				}
+				return false
 			}, resourceImageChangeEnabled),
 			customdiff.IfValueChange("link_to", func(old, new, meta interface{}) bool {
-				return old.(int) != new.(int)
+				if old.(int) != new.(int) {
+					return true
+				}
+				return false
 			}, resourceImageLink),
 			customdiff.IfValueChange("name", func(old, new, meta interface{}) bool {
-				return old.(string) != new.(string) && old.(string) != ""
+				if old.(string) != new.(string) && old.(string) != "" {
+					return true
+				}
+				return false
 			}, resourceImageEditName),
 			customdiff.IfValueChange("shared_with", func(old, new, meta interface{}) bool {
 				o := old.([]interface{})
@@ -355,10 +364,16 @@ func resourceVirtualImage() *schema.Resource {
 						count++
 					}
 				}
-				return count == 0
+				if count == 0 {
+					return true
+				}
+				return false
 			}, resourceImageShare),
 			customdiff.IfValueChange("computeci_id", func(old, new, meta interface{}) bool {
-				return old.(int) != new.(int)
+				if old.(int) != new.(int) {
+					return true
+				}
+				return false
 			}, resourceImageChangeComputeci),
 			customdiff.IfValueChange("enabled_stacks", func(old, new, meta interface{}) bool {
 				o := old.([]interface{})
@@ -375,7 +390,10 @@ func resourceVirtualImage() *schema.Resource {
 						count++
 					}
 				}
-				return count == 0
+				if count == 0 {
+					return true
+				}
+				return false
 			}, resourceImageUpdateNodes),
 		),
 

decort/ssh_subresource.go

@@ -0,0 +1,104 @@
+/*
+Copyright (c) 2019-2021 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Author: Sergey Shubin, <sergey.shubin@digitalenergy.online>, <svs1370@gmail.com>
+
+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.
+*/
+
+package decort
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	// "github.com/hashicorp/terraform-plugin-sdk/helper/validation"
+)
+
+/*
+func makeSshKeysConfig(arg_list []interface{}) (sshkeys []SshKeyConfig, count int) {
+	count = len(arg_list)
+	if count < 1 {
+		return nil, 0
+	}
+
+	sshkeys = make([]SshKeyConfig, count)
+	var subres_data map[string]interface{}
+	for index, value := range arg_list {
+		subres_data = value.(map[string]interface{})
+		sshkeys[index].User = subres_data["user"].(string)
+		sshkeys[index].SshKey = subres_data["public_key"].(string)
+		sshkeys[index].UserShell = subres_data["shell"].(string)
+	}
+
+	return sshkeys, count
+}
+*/
+
+func makeSshKeysArgString(arg_list []interface{}) string {
+	// This function expects arg_list = data.Get("ssh_keys"), where "data" is a populated schema for Compute 
+	// Resource (see func resourceCompute() definition) or Compute Data Source (see func dataSourceCompute())
+
+	// Prepare a string with username and public ssh key value in a format recognized by cloud-init utility.
+	// It is designed to be passed as "userdata" argument of virtual machine create API call.
+	// The following format is expected:
+	// '{"users": [{"ssh-authorized-keys": ["SSH_PUBCIC_KEY_VALUE"], "shell": "SHELL_VALUE", "name": "USERNAME_VALUE"}, {...}, ]}'
+
+	/*
+		`%s\n
+		  - name: %s\n
+			ssh-authorized-keys:
+			- %s\n
+			shell: /bin/bash`
+	*/
+
+	if len(arg_list) < 1 {
+		return ""
+	}
+
+	out := `{"users": [`
+	const UserdataTemplate = `%s{"ssh-authorized-keys": ["%s"], "shell": "%s", "name": "%s"}, `
+	const out_suffix = `]}`
+
+	for _, value := range arg_list {
+		subres_data := value.(map[string]interface{})
+
+		out = fmt.Sprintf(UserdataTemplate, out, subres_data["public_key"].(string), subres_data["shell"].(string), subres_data["user"].(string))
+	}
+	out = fmt.Sprintf("%s %s", out, out_suffix)
+	return out
+}
+
+func sshSubresourceSchemaMake() map[string]*schema.Schema {
+	rets := map[string]*schema.Schema{
+		"user": {
+			Type:        schema.TypeString,
+			Required:    true,
+			Description: "Name of the guest OS user of a new compute, for which the following SSH key will be authorized.",
+		},
+
+		"public_key": {
+			Type:        schema.TypeString,
+			Required:    true,
+			Description: "Public SSH key to authorize to the specified guest OS user on the compute being created.",
+		},
+
+		"shell": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Default:     "/bin/bash",
+			Description: "Guest user shell. This parameter is optional, default is /bin/bash.",
+		},
+	}
+
+	return rets
+}

decort/utility_account.go

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
+Copyright (c) 2019-2021 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Author: Sergey Shubin, <sergey.shubin@digitalenergy.online>, <svs1370@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,35 +26,131 @@ package decort
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/url"
-	"strconv"
 
 	log "github.com/sirupsen/logrus"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	// "github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 )
 
-func utilityAccountCheckPresence(d *schema.ResourceData, m interface{}) (*AccountWithResources, error) {
-	account := &AccountWithResources{}
+func utilityAccountCheckPresence(d *schema.ResourceData, m interface{}) (string, error) {
 	controller := m.(*ControllerCfg)
 	urlValues := &url.Values{}
 
-	if (strconv.Itoa(d.Get("account_id").(int))) != "0" {
-		urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-	} else {
-		urlValues.Add("accountId", d.Id())
+	accId, argSet := d.GetOk("account_id")
+	if argSet {
+		// get Account right away by its ID
+		log.Debugf("utilityAccountCheckPresence: locating Account by its ID %d", accId.(int))
+		urlValues.Add("accountId", fmt.Sprintf("%d", accId.(int)))
+		apiResp, err := controller.decortAPICall("POST", AccountsGetAPI, urlValues)
+		if err != nil {
+			return "", err
+		}
+		return apiResp, nil
 	}
 
-	log.Debugf("utilityAccountCheckPresence: load account")
-	accountRaw, err := controller.decortAPICall("POST", accountGetAPI, urlValues)
+	accName, argSet := d.GetOk("name")
+	if !argSet {
+		// neither ID nor name - no account for you!
+		return "", fmt.Errorf("Cannot check account presence if name is empty and no account ID specified")
+	}
+
+	apiResp, err := controller.decortAPICall("POST", AccountsListAPI, urlValues)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-
-	err = json.Unmarshal([]byte(accountRaw), &account)
+	// log.Debugf("%s", apiResp)
+	// log.Debugf("utilityAccountCheckPresence: ready to decode response body from %q", AccountsListAPI)
+	accList := AccountsListResp{}
+	err = json.Unmarshal([]byte(apiResp), &accList)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 
-	return account, nil
+	log.Debugf("utilityAccountCheckPresence: traversing decoded Json of length %d", len(accList))
+	for index, item := range accList {
+		// match by account name
+		if item.Name == accName.(string) {
+			log.Debugf("utilityAccountCheckPresence: match account name %q / ID %d at index %d",
+				item.Name, item.ID, index)
+
+			// NB: unlike accounts/get API, accounts/list API returns abridged set of account info,
+			// for instance it does not return quotas
+
+			reencodedItem, err := json.Marshal(item)
+			if err != nil {
+				return "", err
+			}
+			return string(reencodedItem[:]), nil
+		}
+	}
+
+	return "", fmt.Errorf("Cannot find account name %q", accName.(string))
+}
+
+func utilityGetAccountIdBySchema(d *schema.ResourceData, m interface{}) (int, error) {
+	/*
+		This function expects schema that contains the following two elements:
+
+		"account_name": &schema.Schema{
+			Type:        schema.TypeString,
+			Required:    Optional,
+			Description: "Name of the account, ....",
+		},
+
+		"account_id": &schema.Schema{
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Unique ID of the account, ....",
+		},
+
+		Then it will check, which argument is set, and if account name is present, it will
+		initiate API calls to the DECORT cloud controller and try to match relevant account
+		by the name.
+
+		NOTE that for some resources (most notably, Resource Group) "account_name" attribute is 
+		marked as "Computed: true", so the only way to fully identify Resource Group is to specify 
+		"account_id", which is marked as "Required: true"
+
+	*/
+
+	accId, argSet := d.GetOk("account_id")
+	if argSet {
+		if accId.(int) > 0 {
+			return accId.(int), nil
+		}
+		return 0, fmt.Errorf("Account ID must be positive")
+	}
+
+	accName, argSet := d.GetOk("account_name")
+	if !argSet {
+		return 0, fmt.Errorf("Either non-empty account name or valid account ID must be specified")
+	}
+
+	controller := m.(*ControllerCfg)
+	urlValues := &url.Values{}
+	apiResp, err := controller.decortAPICall("POST", AccountsListAPI, urlValues)
+	if err != nil {
+		return 0, err
+	}
+
+	model := AccountsListResp{}
+	err = json.Unmarshal([]byte(apiResp), &model)
+	if err != nil {
+		return 0, err
+	}
+
+	log.Debugf("utilityGetAccountIdBySchema: traversing decoded Json of length %d", len(model))
+	for index, item := range model {
+		// need to match Account by name
+		if item.Name == accName.(string) {
+			log.Debugf("utilityGetAccountIdBySchema: match Account name %q / ID %d at index %d",
+				item.Name, item.ID, index)
+			return item.ID, nil
+		}
+	}
+
+	return 0, fmt.Errorf("Cannot find account %q for the current user. Check account name and your access rights", accName.(string))
 }

decort/utility_account_audits_list.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountAuditsListCheckPresence(d *schema.ResourceData, m interface{}) (AccountAuditsList, error) {
-	accountAuditsList := AccountAuditsList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-	log.Debugf("utilityAccountAuditsListCheckPresence: load account list")
-	accountAuditsListRaw, err := controller.decortAPICall("POST", accountAuditsAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountAuditsListRaw), &accountAuditsList)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountAuditsList, nil
-}

decort/utility_account_computes_list.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountComputesListCheckPresence(d *schema.ResourceData, m interface{}) (AccountComputesList, error) {
-	accountComputesList := AccountComputesList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-	log.Debugf("utilityAccountComputesListCheckPresence: load account list")
-	accountComputesListRaw, err := controller.decortAPICall("POST", accountListComputesAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountComputesListRaw), &accountComputesList)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountComputesList, nil
-}

decort/utility_account_consumed_units.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountConsumedUnitsCheckPresence(d *schema.ResourceData, m interface{}) (*ResourceLimits, error) {
-	accountConsumedUnits := &ResourceLimits{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-	log.Debugf("utilityAccountConsumedUnitsCheckPresence: load account list")
-	accountConsumedUnitsRaw, err := controller.decortAPICall("POST", accountGetConsumedUnitsAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountConsumedUnitsRaw), accountConsumedUnits)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountConsumedUnits, nil
-}

decort/utility_account_consumed_units_by_type.go

@@ -1,55 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"net/url"
-	"strconv"
-	"strings"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountConsumedUnitsByTypeCheckPresence(d *schema.ResourceData, m interface{}) (float64, error) {
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-	urlValues.Add("cutype", strings.ToUpper(d.Get("cu_type").(string)))
-
-	log.Debugf("utilityAccountConsumedUnitsByTypeCheckPresence")
-	resultRaw, err := controller.decortAPICall("POST", accountGetConsumedUnitsByTypeAPI, urlValues)
-	if err != nil {
-		return 0, err
-	}
-	result, err := strconv.ParseFloat(resultRaw, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return result, nil
-}

decort/utility_account_deleted_list.go

@@ -1,61 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountDeletedListCheckPresence(d *schema.ResourceData, m interface{}) (AccountCloudApiList, error) {
-	accountDeletedList := AccountCloudApiList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	if page, ok := d.GetOk("page"); ok {
-		urlValues.Add("page", strconv.Itoa(page.(int)))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		urlValues.Add("size", strconv.Itoa(size.(int)))
-	}
-
-	log.Debugf("utilityAccountDeletedListCheckPresence: load")
-	accountDeletedListRaw, err := controller.decortAPICall("POST", accountListDeletedAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountDeletedListRaw), &accountDeletedList)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountDeletedList, nil
-}

decort/utility_account_disks_list.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountDisksListCheckPresence(d *schema.ResourceData, m interface{}) (AccountDisksList, error) {
-	accountDisksList := AccountDisksList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-	log.Debugf("utilityAccountDisksListCheckPresence: load account list")
-	accountDisksListRaw, err := controller.decortAPICall("POST", accountListDisksAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountDisksListRaw), &accountDisksList)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountDisksList, nil
-}

decort/utility_account_flip_groups.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountFlipGroupsListCheckPresence(d *schema.ResourceData, m interface{}) (AccountFlipGroupsList, error) {
-	accountFlipGroupsList := AccountFlipGroupsList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-	log.Debugf("utilityAccountFlipGroupsListCheckPresence")
-	accountFlipGroupsListRaw, err := controller.decortAPICall("POST", accountListFlipGroupsAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountFlipGroupsListRaw), &accountFlipGroupsList)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountFlipGroupsList, nil
-}

decort/utility_account_list.go

@@ -1,89 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountListCheckPresence(d *schema.ResourceData, m interface{}) (AccountCloudApiList, error) {
-	accountList := AccountCloudApiList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	if page, ok := d.GetOk("page"); ok {
-		urlValues.Add("page", strconv.Itoa(page.(int)))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		urlValues.Add("size", strconv.Itoa(size.(int)))
-	}
-
-	log.Debugf("utilityAccountListCheckPresence: load account list")
-	accountListRaw, err := controller.decortAPICall("POST", accountListAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountListRaw), &accountList)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountList, nil
-}
-
-/*uncomment for cloudbroker
-func utilityAccountListCheckPresence(d *schema.ResourceData, m interface{}) (AccountList, error) {
-	accountList := AccountList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	if page, ok := d.GetOk("page"); ok {
-		urlValues.Add("page", strconv.Itoa(page.(int)))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		urlValues.Add("size", strconv.Itoa(size.(int)))
-	}
-
-	log.Debugf("utilityAccountListCheckPresence: load account list")
-	accountListRaw, err := controller.decortAPICall("POST", accountListAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountListRaw), &accountList)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountList, nil
-}
-*/

decort/utility_account_reserved_units.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountReservedUnitsCheckPresence(d *schema.ResourceData, m interface{}) (*ResourceLimits, error) {
-	accountReservedUnits := &ResourceLimits{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-	log.Debugf("utilityAccountReservedUnitsCheckPresence: load units")
-	accountReservedUnitsRaw, err := controller.decortAPICall("POST", accountGetReservedUnitsAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountReservedUnitsRaw), accountReservedUnits)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountReservedUnits, nil
-}

decort/utility_account_rg_list.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountRGListCheckPresence(d *schema.ResourceData, m interface{}) (AccountRGList, error) {
-	accountRGList := AccountRGList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-	log.Debugf("utilityAccountRGListCheckPresence: load account list")
-	accountRGListRaw, err := controller.decortAPICall("POST", accountListRGAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountRGListRaw), &accountRGList)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountRGList, nil
-}

decort/utility_account_templates_list.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountTemplatesListCheckPresence(d *schema.ResourceData, m interface{}) (AccountTemplatesList, error) {
-	accountTemplatesList := AccountTemplatesList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-	log.Debugf("utilityAccountTemplatesListCheckPresence: load")
-	accountTemplatesListRaw, err := controller.decortAPICall("POST", accountListTemplatesAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountTemplatesListRaw), &accountTemplatesList)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountTemplatesList, nil
-}

decort/utility_account_vins_list.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityAccountVinsListCheckPresence(d *schema.ResourceData, m interface{}) (AccountVinsList, error) {
-	accountVinsList := AccountVinsList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-	log.Debugf("utilityAccountVinsListCheckPresence: load account list")
-	accountVinsListRaw, err := controller.decortAPICall("POST", accountListVinsAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(accountVinsListRaw), &accountVinsList)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountVinsList, nil
-}

decort/utility_bservicce_deleted_list.go

@@ -1,67 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityBasicServiceDeletedListCheckPresence(d *schema.ResourceData, m interface{}) (BasicServiceList, error) {
-	basicServiceDeletedList := BasicServiceList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	if accountId, ok := d.GetOk("account_id"); ok {
-		urlValues.Add("accountId", strconv.Itoa(accountId.(int)))
-	}
-	if rgId, ok := d.GetOk("rg_id"); ok {
-		urlValues.Add("rgId", strconv.Itoa(rgId.(int)))
-	}
-	if page, ok := d.GetOk("page"); ok {
-		urlValues.Add("page", strconv.Itoa(page.(int)))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		urlValues.Add("size", strconv.Itoa(size.(int)))
-	}
-
-	log.Debugf("utilityBasicServiceDeletedListCheckPresence")
-	basicServiceDeletedListRaw, err := controller.decortAPICall("POST", bserviceListDeletedAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(basicServiceDeletedListRaw), &basicServiceDeletedList)
-	if err != nil {
-		return nil, err
-	}
-
-	return basicServiceDeletedList, nil
-}

decort/utility_bservice.go

@@ -1,60 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityBasicServiceCheckPresence(d *schema.ResourceData, m interface{}) (*BasicServiceExtend, error) {
-	bservice := &BasicServiceExtend{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	if (strconv.Itoa(d.Get("service_id").(int))) != "0" {
-		urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-	} else {
-		urlValues.Add("serviceId", d.Id())
-	}
-
-	log.Debugf("utilityBasicServiceCheckPresence")
-	bserviceRaw, err := controller.decortAPICall("POST", bserviceGetAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(bserviceRaw), &bservice)
-	if err != nil {
-		return nil, err
-	}
-
-	return bservice, nil
-}

decort/utility_bservice_group.go

@@ -1,61 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityBasicServiceGroupCheckPresence(d *schema.ResourceData, m interface{}) (*BasicServiceGroup, error) {
-	bserviceGroup := &BasicServiceGroup{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("serviceId", strconv.Itoa(d.Get("service_id").(int)))
-	if (strconv.Itoa(d.Get("compgroup_id").(int))) != "0" {
-		urlValues.Add("compgroupId", strconv.Itoa(d.Get("compgroup_id").(int)))
-	} else {
-		urlValues.Add("compgroupId", d.Id())
-	}
-
-	log.Debugf("utilityBasicServiceGroupCheckPresence")
-	bserviceGroupRaw, err := controller.decortAPICall("POST", bserviceGroupGetAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(bserviceGroupRaw), &bserviceGroup)
-	if err != nil {
-		return nil, err
-	}
-
-	return bserviceGroup, nil
-}

decort/utility_bservice_list.go

@@ -1,67 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityBasicServiceListCheckPresence(d *schema.ResourceData, m interface{}) (BasicServiceList, error) {
-	basicServiceList := BasicServiceList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	if accountId, ok := d.GetOk("account_id"); ok {
-		urlValues.Add("accountId", strconv.Itoa(accountId.(int)))
-	}
-	if rgId, ok := d.GetOk("rg_id"); ok {
-		urlValues.Add("rgId", strconv.Itoa(rgId.(int)))
-	}
-	if page, ok := d.GetOk("page"); ok {
-		urlValues.Add("page", strconv.Itoa(page.(int)))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		urlValues.Add("size", strconv.Itoa(size.(int)))
-	}
-
-	log.Debugf("utilityBasicServiceListCheckPresence")
-	basicServiceListRaw, err := controller.decortAPICall("POST", bserviceListAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(basicServiceListRaw), &basicServiceList)
-	if err != nil {
-		return nil, err
-	}
-
-	return basicServiceList, nil
-}

decort/utility_bservice_snapshot_list.go

@@ -1,58 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityBasicServiceSnapshotListCheckPresence(d *schema.ResourceData, m interface{}) (BasicServiceSnapshots, error) {
-	basicServiceSnapshotList := BasicServiceSnapshots{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	if serviceId, ok := d.GetOk("service_id"); ok {
-		urlValues.Add("serviceId", strconv.Itoa(serviceId.(int)))
-	}
-
-	log.Debugf("utilityBasicServiceSnapshotListCheckPresence")
-	basicServiceSnapshotListRaw, err := controller.decortAPICall("POST", bserviceSnapshotListAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(basicServiceSnapshotListRaw), &basicServiceSnapshotList)
-	if err != nil {
-		return nil, err
-	}
-
-	return basicServiceSnapshotList, nil
-}

decort/utility_compute.go

@@ -38,14 +38,14 @@ import (
 
 func (ctrl *ControllerCfg) utilityComputeExtraDisksConfigure(d *schema.ResourceData, do_delta bool) error {
 	// d is filled with data according to computeResource schema, so extra disks config is retrieved via "extra_disks" key
-	// If do_delta is true, this function will identify changes between new and existing specs for extra disks and try to
+	// If do_delta is true, this function will identify changes between new and existing specs for extra disks and try to 
 	// update compute configuration accordingly
-	// Otherwise it will apply whatever is found in the new set of "extra_disks" right away.
+	// Otherwise it will apply whatever is found in the new set of "extra_disks" right away. 
 	// Primary use of do_delta=false is when calling this function from compute Create handler.
 
-	// Note that this function will not abort on API errors, but will continue to configure (attach / detach) other individual
+	// Note that this function will not abort on API errors, but will continue to configure (attach / detach) other individual 
 	// disks via atomic API calls. However, it will not retry failed manipulation on the same disk.
-	log.Debugf("utilityComputeExtraDisksConfigure: called for Compute ID %s with do_delta = %t", d.Id(), do_delta)
+	log.Debugf("utilityComputeExtraDisksConfigure: called for Compute ID %s with do_delta = %b", d.Id(), do_delta)
 
 	// NB: as of rc-1.25 "extra_disks" are TypeSet with the elem of TypeInt
 	old_set, new_set := d.GetChange("extra_disks")
@@ -71,11 +71,11 @@ func (ctrl *ControllerCfg) utilityComputeExtraDisksConfigure(d *schema.ResourceD
 		}
 
 		if apiErrCount > 0 {
-			log.Errorf("utilityComputeExtraDisksConfigure: there were %d error(s) when attaching disks to Compute ID %s. Last error was: %s",
-				apiErrCount, d.Id(), lastSavedError)
+			log.Errorf("utilityComputeExtraDisksConfigure: there were %d error(s) when attaching disks to Compute ID %s. Last error was: %s", 
+			           apiErrCount, d.Id(), lastSavedError)
 			return lastSavedError
 		}
-
+		
 		return nil
 	}
 
@@ -110,8 +110,8 @@ func (ctrl *ControllerCfg) utilityComputeExtraDisksConfigure(d *schema.ResourceD
 	}
 
 	if apiErrCount > 0 {
-		log.Errorf("utilityComputeExtraDisksConfigure: there were %d error(s) when managing disks of Compute ID %s. Last error was: %s",
-			apiErrCount, d.Id(), lastSavedError)
+		log.Errorf("utilityComputeExtraDisksConfigure: there were %d error(s) when managing disks of Compute ID %s. Last error was: %s", 
+				   apiErrCount, d.Id(), lastSavedError)
 		return lastSavedError
 	}
 
@@ -120,11 +120,11 @@ func (ctrl *ControllerCfg) utilityComputeExtraDisksConfigure(d *schema.ResourceD
 
 func (ctrl *ControllerCfg) utilityComputeNetworksConfigure(d *schema.ResourceData, do_delta bool) error {
 	// "d" is filled with data according to computeResource schema, so extra networks config is retrieved via "network" key
-	// If do_delta is true, this function will identify changes between new and existing specs for network and try to
+	// If do_delta is true, this function will identify changes between new and existing specs for network and try to 
 	// update compute configuration accordingly
-	// Otherwise it will apply whatever is found in the new set of "network" right away.
+	// Otherwise it will apply whatever is found in the new set of "network" right away. 
 	// Primary use of do_delta=false is when calling this function from compute Create handler.
-
+	
 	old_set, new_set := d.GetChange("network")
 
 	apiErrCount := 0
@@ -137,7 +137,7 @@ func (ctrl *ControllerCfg) utilityComputeNetworksConfigure(d *schema.ResourceDat
 
 		for _, runner := range new_set.(*schema.Set).List() {
 			urlValues := &url.Values{}
-			net_data := runner.(map[string]interface{})
+			net_data := runner.(map[string]interface{}) 
 			urlValues.Add("computeId", d.Id())
 			urlValues.Add("netType", net_data["net_type"].(string))
 			urlValues.Add("netId", fmt.Sprintf("%d", net_data["net_id"].(int)))
@@ -154,8 +154,8 @@ func (ctrl *ControllerCfg) utilityComputeNetworksConfigure(d *schema.ResourceDat
 		}
 
 		if apiErrCount > 0 {
-			log.Errorf("utilityComputeNetworksConfigure: there were %d error(s) when managing networks of Compute ID %s. Last error was: %s",
-				apiErrCount, d.Id(), lastSavedError)
+			log.Errorf("utilityComputeNetworksConfigure: there were %d error(s) when managing networks of Compute ID %s. Last error was: %s", 
+					   apiErrCount, d.Id(), lastSavedError)
 			return lastSavedError
 		}
 		return nil
@@ -172,8 +172,8 @@ func (ctrl *ControllerCfg) utilityComputeNetworksConfigure(d *schema.ResourceDat
 		_, err := ctrl.decortAPICall("POST", ComputeNetDetachAPI, urlValues)
 		if err != nil {
 			// failed to detach this network - there will be partial resource update
-			log.Errorf("utilityComputeNetworksConfigure: failed to detach net ID %d of type %s from Compute ID %s: %s",
-				net_data["net_id"].(int), net_data["net_type"].(string), d.Id(), err)
+			log.Errorf("utilityComputeNetworksConfigure: failed to detach net ID %d of type %s from Compute ID %s: %s", 
+			           net_data["net_id"].(int), net_data["net_type"].(string), d.Id(), err)
 			apiErrCount++
 			lastSavedError = err
 		}
@@ -185,7 +185,7 @@ func (ctrl *ControllerCfg) utilityComputeNetworksConfigure(d *schema.ResourceDat
 		urlValues := &url.Values{}
 		net_data := runner.(map[string]interface{})
 		urlValues.Add("computeId", d.Id())
-		urlValues.Add("netId", fmt.Sprintf("%d", net_data["net_id"].(int)))
+		urlValues.Add("netId", fmt.Sprintf("%d",net_data["net_id"].(int)))
 		urlValues.Add("netType", net_data["net_type"].(string))
 		if net_data["ip_address"].(string) != "" {
 			urlValues.Add("ipAddr", net_data["ip_address"].(string))
@@ -193,16 +193,16 @@ func (ctrl *ControllerCfg) utilityComputeNetworksConfigure(d *schema.ResourceDat
 		_, err := ctrl.decortAPICall("POST", ComputeNetAttachAPI, urlValues)
 		if err != nil {
 			// failed to attach this network - there will be partial resource update
-			log.Errorf("utilityComputeNetworksConfigure: failed to attach net ID %d of type %s to Compute ID %s: %s",
-				net_data["net_id"].(int), net_data["net_type"].(string), d.Id(), err)
+			log.Errorf("utilityComputeNetworksConfigure: failed to attach net ID %d of type %s to Compute ID %s: %s", 
+			           net_data["net_id"].(int), net_data["net_type"].(string), d.Id(), err)
 			apiErrCount++
 			lastSavedError = err
 		}
 	}
-
+	
 	if apiErrCount > 0 {
-		log.Errorf("utilityComputeNetworksConfigure: there were %d error(s) when managing networks of Compute ID %s. Last error was: %s",
-			apiErrCount, d.Id(), lastSavedError)
+		log.Errorf("utilityComputeNetworksConfigure: there were %d error(s) when managing networks of Compute ID %s. Last error was: %s", 
+				   apiErrCount, d.Id(), lastSavedError)
 		return lastSavedError
 	}
 
@@ -262,7 +262,7 @@ func utilityComputeCheckPresence(d *schema.ResourceData, m interface{}) (string,
 	if !argSet {
 		return "", fmt.Errorf("Cannot locate compute by name %s if no resource group ID is set", computeName.(string))
 	}
-
+	
 	urlValues.Add("rgId", fmt.Sprintf("%d", rgId))
 	apiResp, err := controller.decortAPICall("POST", RgListComputesAPI, urlValues)
 	if err != nil {

decort/utility_disk.go

@@ -16,15 +16,16 @@ limitations under the License.
 */
 
 /*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
+This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration 
 Technology platfom.
 
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
+Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates. 
 */
 
 package decort
 
 import (
+
 	"encoding/json"
 	"fmt"
 	"net/url"
@@ -35,15 +36,16 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
+
 func utilityDiskCheckPresence(d *schema.ResourceData, m interface{}) (string, error) {
-	// This function tries to locate Disk by one of the following algorithms depending on
+	// This function tries to locate Disk by one of the following algorithms depending on 
 	// the parameters passed:
 	//    - if disk ID is specified -> by disk ID
 	//    - if disk name is specifeid -> by disk name and either account ID or account name
 	//
 	// NOTE: disk names are not unique, so the first occurence of this name in the account will
 	// be returned. There is no such ambiguity when locating disk by its ID.
-	//
+	// 
 	// If succeeded, it returns non empty string that contains JSON formatted facts about the disk
 	// as returned by disks/get API call.
 	// Otherwise it returns empty string and meaningful error.
@@ -62,7 +64,7 @@ func utilityDiskCheckPresence(d *schema.ResourceData, m interface{}) (string, er
 	if err != nil || theId <= 0 {
 		diskId, argSet := d.GetOk("disk_id")
 		if argSet {
-			theId = diskId.(int)
+			theId =diskId.(int)
 			idSet = true
 		}
 	} else {
@@ -90,14 +92,18 @@ func utilityDiskCheckPresence(d *schema.ResourceData, m interface{}) (string, er
 
 	// Valid account ID is required to locate disks
 	// obtain Account ID by account name - it should not be zero on success
+	validatedAccountId, err := utilityGetAccountIdBySchema(d, m)
+	if err != nil {
+		return "", err
+	}
 
-	urlValues.Add("accountId", fmt.Sprintf("%d", d.Get("account_id").(int)))
+	urlValues.Add("accountId", fmt.Sprintf("%d", validatedAccountId))
 	diskFacts, err := controller.decortAPICall("POST", DisksListAPI, urlValues)
 	if err != nil {
 		return "", err
 	}
 
-	log.Debugf("utilityDiskCheckPresence: ready to unmarshal string %s", diskFacts)
+	log.Debugf("utilityDiskCheckPresence: ready to unmarshal string %s", diskFacts) 
 
 	disksList := DisksListResp{}
 	err = json.Unmarshal([]byte(diskFacts), &disksList)
@@ -113,25 +119,25 @@ func utilityDiskCheckPresence(d *schema.ResourceData, m interface{}) (string, er
 			log.Debugf("utilityDiskCheckPresence: index %d, matched disk name %q", index, item.Name)
 			// we found the disk we need - not get detailed information via API call to disks/get
 			/*
-				// TODO: this may not be optimal as it initiates one extra call to the DECORT controller
-				// in spite of the fact that we already have all required information about the disk in
-				// item variable
-				//
-				get_urlValues := &url.Values{}
-				get_urlValues.Add("diskId", fmt.Sprintf("%d", item.ID))
-				diskFacts, err = controller.decortAPICall("POST", DisksGetAPI, get_urlValues)
-				if err != nil {
-					return "", err
-				}
-				return diskFacts, nil
+			// TODO: this may not be optimal as it initiates one extra call to the DECORT controller
+			// in spite of the fact that we already have all required information about the disk in
+			// item variable
+			//
+			get_urlValues := &url.Values{}
+			get_urlValues.Add("diskId", fmt.Sprintf("%d", item.ID))
+			diskFacts, err = controller.decortAPICall("POST", DisksGetAPI, get_urlValues)
+			if err != nil {
+				return "", err
+			}
+			return diskFacts, nil
 			*/
 			reencodedItem, err := json.Marshal(item)
 			if err != nil {
 				return "", err
 			}
-			return string(reencodedItem[:]), nil
+			return string(reencodedItem[:]), nil 
 		}
 	}
 
 	return "", nil // there should be no error if disk does not exist
-}
+}

decort/utility_disk_list.go

@@ -1,68 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-	"strings"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityDiskListCheckPresence(d *schema.ResourceData, m interface{}) (DisksListResp, error) {
-	diskList := DisksListResp{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	if page, ok := d.GetOk("page"); ok {
-		urlValues.Add("page", strconv.Itoa(page.(int)))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		urlValues.Add("size", strconv.Itoa(size.(int)))
-	}
-	if diskType, ok := d.GetOk("type"); ok {
-		urlValues.Add("type", strings.ToUpper(diskType.(string)))
-	}
-	if accountId, ok := d.GetOk("accountId"); ok {
-		urlValues.Add("accountId", strconv.Itoa(accountId.(int)))
-	}
-
-	log.Debugf("utilityDiskListCheckPresence: load grid list")
-	diskListRaw, err := controller.decortAPICall("POST", DisksListAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(diskListRaw), &diskList)
-	if err != nil {
-		return nil, err
-	}
-
-	return diskList, nil
-}

decort/utility_extnet.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityExtnetCheckPresence(d *schema.ResourceData, m interface{}) (*ExtnetDetailed, error) {
-	extnet := &ExtnetDetailed{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("net_id", strconv.Itoa(d.Get("net_id").(int)))
-
-	log.Debugf("utilityExtnetCheckPresence")
-	extnetRaw, err := controller.decortAPICall("POST", extnetGetAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(extnetRaw), &extnet)
-	if err != nil {
-		return nil, err
-	}
-
-	return extnet, nil
-}

decort/utility_extnet_computes_list.go

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityExtnetComputesListCheckPresence(d *schema.ResourceData, m interface{}) (ExtnetComputesList, error) {
-	extnetComputesList := ExtnetComputesList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	urlValues.Add("accountId", strconv.Itoa(d.Get("account_id").(int)))
-
-	log.Debugf("utilityExtnetComputesListCheckPresence")
-	extnetComputesListRaw, err := controller.decortAPICall("POST", extnetListComputesAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(extnetComputesListRaw), &extnetComputesList)
-	if err != nil {
-		return nil, err
-	}
-
-	return extnetComputesList, nil
-}

decort/utility_extnet_default.go

@@ -1,46 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"net/url"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityExtnetDefaultCheckPresence(_ *schema.ResourceData, m interface{}) (string, error) {
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	log.Debugf("utilityExtnetDefaultCheckPresence")
-	res, err := controller.decortAPICall("POST", extnetGetDefaultAPI, urlValues)
-	if err != nil {
-		return "", err
-	}
-
-	return res, nil
-}

decort/utility_extnet_list.go

@@ -1,64 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityExtnetListCheckPresence(d *schema.ResourceData, m interface{}) (ExtnetList, error) {
-	extnetList := ExtnetList{}
-	controller := m.(*ControllerCfg)
-	urlValues := &url.Values{}
-
-	if accountId, ok := d.GetOk("account_id"); ok {
-		urlValues.Add("accountId", strconv.Itoa(accountId.(int)))
-	}
-	if page, ok := d.GetOk("page"); ok {
-		urlValues.Add("page", strconv.Itoa(page.(int)))
-	}
-	if size, ok := d.GetOk("size"); ok {
-		urlValues.Add("size", strconv.Itoa(size.(int)))
-	}
-
-	log.Debugf("utilityExtnetListCheckPresence")
-	extnetListRaw, err := controller.decortAPICall("POST", extnetListAPI, urlValues)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal([]byte(extnetListRaw), &extnetList)
-	if err != nil {
-		return nil, err
-	}
-
-	return extnetList, nil
-}

decort/utility_general.go

@@ -0,0 +1,48 @@
+/*
+Copyright (c) 2019-2021 Digital Energy Cloud Solutions LLC. All Rights Reserved.
+Author: Sergey Shubin, <sergey.shubin@digitalenergy.online>, <svs1370@gmail.com>
+
+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.
+*/
+
+/*
+This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration 
+Technology platfom.
+
+Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates. 
+*/
+
+package decort
+
+import (
+
+	"strings"
+
+)
+
+func Jo2JSON(arg_str string) string {
+	// DECORT API historically returns response in the form of Python dictionary, which generally
+	// looks like JSON, but does not comply with JSON syntax.
+	// For Golang JSON Unmarshal to work properly we need to pre-process API response as follows:   
+	ret_string := strings.Replace(string(arg_str), "u'", "\"", -1)
+	ret_string = strings.Replace(ret_string, "'", "\"", -1)
+	ret_string = strings.Replace(ret_string, ": False", ": false", -1)
+	ret_string = strings.Replace(ret_string, ": True", ": true", -1)
+	ret_string = strings.Replace(ret_string, "null", "\"\"", -1)
+	ret_string = strings.Replace(ret_string, "None", "\"\"", -1)
+
+	// fix for incorrect handling of usage info
+	// ret_string = strings.Replace(ret_string, "<", "\"", -1)
+	// ret_string = strings.Replace(ret_string, ">", "\"", -1)
+	return ret_string
+}

decort/utility_grid.go

@@ -27,6 +27,7 @@ package decort
 import (
 	"encoding/json"
 	"errors"
+	"fmt"
 	"net/url"
 	"strconv"
 
@@ -43,7 +44,7 @@ func utilityGridCheckPresence(d *schema.ResourceData, m interface{}) (*Grid, err
 	if gridId, ok := d.GetOk("grid_id"); ok {
 		urlValues.Add("gridId", strconv.Itoa(gridId.(int)))
 	} else {
-		return nil, errors.New("grid_id is required")
+		return nil, errors.New(fmt.Sprintf("grid_id is required"))
 	}
 
 	log.Debugf("utilityGridCheckPresence: load grid")

decort/utility_pcidevice.go

@@ -1,54 +0,0 @@
-/*
-Copyright (c) 2019-2022 Digital Energy Cloud Solutions LLC. All Rights Reserved.
-Author: Stanislav Solovev, <spsolovev@digitalenergy.online>, <svs1370@gmail.com>
-
-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.
-*/
-
-/*
-This file is part of Terraform (by Hashicorp) provider for Digital Energy Cloud Orchestration
-Technology platfom.
-
-Visit https://github.com/rudecs/terraform-provider-decort for full source code package and updates.
-*/
-
-package decort
-
-import (
-	"strconv"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-)
-
-func utilityPcideviceCheckPresence(d *schema.ResourceData, m interface{}) (*Pcidevice, error) {
-	pcideviceList, err := utilityPcideviceListCheckPresence(d, m)
-	if err != nil {
-		return nil, err
-	}
-
-	pcideviceId := 0
-	if (d.Get("device_id").(int)) != 0 {
-		pcideviceId = d.Get("device_id").(int)
-	} else {
-		id, _ := strconv.Atoi(d.Id())
-		pcideviceId = id
-	}
-
-	for _, pd := range pcideviceList {
-		if pd.ID == pcideviceId {
-			return &pd, nil
-		}
-	}
-
-	return nil, nil
-}