Bugfixes

Author: fabriziofiorucci

etc/config.toml

@@ -30,7 +30,7 @@ port = 6379
 # Devportal helper
 [devportal]
 host = "devportal"
-port = 5000
+port = 5001
 uri = "/v1/devportal"
 
 # Staged configuration for NGINX Management Suite

src/Contrib/DevPortal.py

@@ -13,9 +13,12 @@
 
 
 def buildDevPortal(openapischema):
-    response = requests.post(f"http://{NcgConfig.config['devportal']['host']}:"
-                             f"{NcgConfig.config['devportal']['port']}{NcgConfig.config['devportal']['uri']}",
-                             headers={'Content-Type': 'application/json'}, data=openapischema)
+    try:
+        response = requests.post(f"http://{NcgConfig.config['devportal']['host']}:"
+                                 f"{NcgConfig.config['devportal']['port']}{NcgConfig.config['devportal']['uri']}",
+                                 headers={'Content-Type': 'application/json'}, data=openapischema)
+    except Exception as e:
+        return 400, ""
 
     return response.status_code, json.loads(response.text)
 
@@ -32,6 +35,9 @@ def createDevPortal(locationDeclaration: dict):
             apiSchemaString = Contrib.MiscUtils.yaml_to_json(apiSchemaString)
 
         status, devportalJSON = buildDevPortal(openapischema=apiSchemaString)
-        devportalHTML = base64.b64encode(bytes(devportalJSON['devportal'], 'utf-8')).decode('utf-8')
+        if status == 200:
+            devportalHTML = base64.b64encode(bytes(devportalJSON['devportal'], 'utf-8')).decode('utf-8')
+        else:
+            devportalHTML = ""
 
-    return 200, devportalHTML
+    return status, devportalHTML

src/V3_CreateConfig.py

@@ -152,6 +152,11 @@ def createconfig(declaration: ConfigDeclaration, apiversion: str, runfromautosyn
                         status, devPortalHTML = (
                             Contrib.DevPortal.createDevPortal(locationDeclaration=loc))
 
+                        if status != 200:
+                            return {"status_code": 400,
+                                    "message": {"status_code": status, "message":
+                                        {"code": status, "content": f"Developer Portal creation failed for {loc['apigateway']['openapi_schema']}"}}}
+
                         ### Add optional API Developer portal HTML files
                         # devPortalHTML
                         newAuxFile = {'contents': devPortalHTML, 'name': NcgConfig.config['nms']['devportal_dir'] +
@@ -443,8 +448,13 @@ def createconfig(declaration: ConfigDeclaration, apiversion: str, runfromautosyn
             print(f'Configuration [{configUid}] changed, publishing to NMS')
 
             # Retrieve instance group uid
-            ig = requests.get(url=f'{nmsUrl}/api/platform/v1/instance-groups', auth=(nmsUsername, nmsPassword),
-                              verify=False)
+            try:
+                ig = requests.get(url=f'{nmsUrl}/api/platform/v1/instance-groups', auth=(nmsUsername, nmsPassword),
+                                  verify=False)
+            except Exception as e:
+                return {"status_code": 400,
+                        "message": {"status_code": 400,
+                                    "message": {"code": 400, "content": f"Can't connect to {nmsUrl}"}}}
 
             if ig.status_code != 200:
                 try:

src/V3_NginxConfigDeclaration.py

@@ -10,9 +10,9 @@
 
 
 class OutputConfigMap(BaseModel, extra=Extra.forbid):
-    name: str = ""
+    name: str = "nginx-config"
     namespace: Optional[str] = ""
-    filename: str = ""
+    filename: str = "nginx-config.conf"
 
 
 class OutputHttp(BaseModel, extra=Extra.forbid):