Fixing some brownfield and env fixes

Author: abhijeetkaurav1st

calm/dsl/builtins/models/brownfield.py

@@ -97,7 +97,7 @@ def get_ahv_bf_vm_data(
     cluster_uuid = clusters[0]["uuid"]
 
     params = {
-        "length": 250,
+        "length": 1000,
         "offset": 0,
         "filter": "project_uuid=={};account_uuid=={}".format(
             project_uuid, cluster_uuid
@@ -233,7 +233,7 @@ def get_azure_bf_vm_data(
     client = get_api_client()
 
     params = {
-        "length": 250,
+        "length": 1000,
         "offset": 0,
         "filter": "project_uuid=={};account_uuid=={}".format(
             project_uuid, account_uuid
@@ -259,6 +259,10 @@ def get_azure_bf_vm_data(
         e_id = e_resources["instance_id"]
         e_address = e_resources["address"]
         e_address_list = e_resources["public_ip_address"]
+        e_private_address = e_resources["private_ip_address"]
+        if (not e_address_list) and e_private_address:
+            e_address = [e_private_address]
+            e_address_list = e_private_address
 
         if match_vm_data(
             vm_name=e_name,

calm/dsl/cli/environments.py

@@ -81,7 +81,19 @@ def compile_environment_dsl_class(env_cls, metadata=dict()):
     for sub in env_payload["spec"]["resources"].get("substrate_definition_list", []):
         sub["uuid"] = str(uuid.uuid4())
 
-    # TODO check if credential ref is working in readiness_probe and other places
+    # Adding uuid readiness-probe
+    cred_name_uuid_map = {}
+    for cred in env_payload["spec"]["resources"].get("credential_definition_list", []):
+        cred_name_uuid_map[cred["name"]] = cred["uuid"]
+
+    for sub in env_payload["spec"]["resources"].get("substrate_definition_list", []):
+        try:
+            cred_ref_obj = sub["readiness_probe"]["login_credential_local_reference"]
+            cred_ref_obj["uuid"] = cred_name_uuid_map[cred_ref_obj["name"]]
+        except Exception:
+            pass
+
+    # TODO check if credential ref is working in attributes consuming credentials
 
     return env_payload