#451 fix model docs generation

MetaCell · Mar 8, 2022 · 1f92545 · 1f92545
1 parent 7e9fbea
commit 1f92545
Show file tree

Hide file tree

Showing 37 changed files with 33 additions and 509 deletions.
diff --git a/libraries/cloudharness-common/tests/test_applications.py b/libraries/cloudharness-common/tests/test_applications.py
@@ -1,12 +1,22 @@
+from .test_env import set_default_environment
+
+set_default_environment()
+
 from cloudharness.applications import ApplicationConfiguration, get_configuration
 from cloudharness.utils.config import CloudharnessConfig, ConfigObject
 
+
+
 conf_1 = {
     'name': 'app1',
+
     'harness': {
         'name': 'app1',
+        'subdomain': 'myapp',
         'service': {
-            'auto': False
+            'name': 'app1',
+            'auto': True,
+            'port': 9000
         },
         'deployment': {
             'auto': True,
@@ -63,16 +73,20 @@ def test_get_configuration():
     }
     uut = get_configuration('app1')
     assert uut.harness.name == 'app1'
-    assert not uut.is_auto_service()
+    assert uut.is_auto_service()
     assert uut.is_auto_deployment()
     assert uut.is_sentry_enabled()
     assert uut.image_name == 'image1-name'
+    assert uut.get_public_address() == "https://myapp.cloudharness.metacell.us"
+    assert uut.get_service_address() == "http://app1.ch:9000"
     uut = get_configuration('app2')
     assert uut.name == 'app2'
     assert not uut.is_auto_service()
     assert not uut.is_auto_deployment()
     assert uut.is_sentry_enabled()
 
+
+
     # TODO subapp support
     # uut = get_configuration('app2sub')
 

diff --git a/libraries/cloudharness-common/tests/test_env.py b/libraries/cloudharness-common/tests/test_env.py
@@ -2,10 +2,11 @@
 import os
 import yaml
 
+HERE = os.path.dirname(os.path.realpath(__file__)).replace(os.path.sep, '/')
+os.environ["CH_VALUES_PATH"] = os.path.join(HERE, "values.yaml")
 
 from cloudharness.utils.env import *
 from cloudharness.utils.config import CloudharnessConfig as conf
-HERE = os.path.dirname(os.path.realpath(__file__)).replace(os.path.sep, '/')
 
 def set_test_environment():
 

diff --git a/libraries/models/.openapi-generator-ignore b/libraries/models/.openapi-generator-ignore
@@ -18,7 +18,7 @@
 
 # You can also negate patterns with an exclamation (!).
 # For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
+
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
 test/*
@@ -28,11 +28,15 @@ Dockerfile
 **/openapi/*
 setup.py
 **/test/*
+**/model/*
+**/api/*
+**/apis/*
 .dockerignore
 */__init__.py
 encoder.py
 *.sh
 */util.py
 */models/base_model_.py
 requirements.txt
-*/encoder.py
+*/encoder.py
+*/model_utils.py
diff --git a/libraries/models/docs/ApplicationConfig.md b/libraries/models/docs/ApplicationConfig.md
diff --git a/libraries/models/docs/ApplicationDependenciesConfig.md b/libraries/models/docs/ApplicationDependenciesConfig.md
diff --git a/libraries/models/docs/ApplicationHarnessConfig.md b/libraries/models/docs/ApplicationHarnessConfig.md
diff --git a/libraries/models/docs/ApplicationProbe.md b/libraries/models/docs/ApplicationProbe.md
diff --git a/libraries/models/docs/ApplicationsConfigsMap.md b/libraries/models/docs/ApplicationsConfigsMap.md
diff --git a/libraries/models/docs/AutoArtifactSpec.md b/libraries/models/docs/AutoArtifactSpec.md
diff --git a/libraries/models/docs/BackupConfig.md b/libraries/models/docs/BackupConfig.md
diff --git a/libraries/models/docs/CDCEvent.md b/libraries/models/docs/CDCEvent.md
diff --git a/libraries/models/docs/CDCEventMeta.md b/libraries/models/docs/CDCEventMeta.md
diff --git a/libraries/models/docs/CpuMemoryConfig.md b/libraries/models/docs/CpuMemoryConfig.md
diff --git a/libraries/models/docs/DatabaseDeploymentConfig.md b/libraries/models/docs/DatabaseDeploymentConfig.md
diff --git a/libraries/models/docs/DatabaseDeploymentConfigAllOf.md b/libraries/models/docs/DatabaseDeploymentConfigAllOf.md
diff --git a/libraries/models/docs/DeploymentAutoArtifactConfig.md b/libraries/models/docs/DeploymentAutoArtifactConfig.md
diff --git a/libraries/models/docs/DeploymentResourcesConf.md b/libraries/models/docs/DeploymentResourcesConf.md
diff --git a/libraries/models/docs/FileResourcesConfig.md b/libraries/models/docs/FileResourcesConfig.md
diff --git a/libraries/models/docs/Filename.md b/libraries/models/docs/Filename.md
diff --git a/libraries/models/docs/FreeObject.md b/libraries/models/docs/FreeObject.md
diff --git a/libraries/models/docs/HarnessMainConfig.md b/libraries/models/docs/HarnessMainConfig.md