Create usm endpoint for subcloud region

This commit implements the addition of a new endpoint to the
subcloud region in preparation for the switch to Unified Software Management APIs.

Test Plan:
- Verify that a subcloud can be deployed successfully and the new USM (Unified Software Management) endpoint is created using the command openstack endpoint list |grep <subcloud-name>.

Story: 2010676
Task: 48061

Signed-off-by: Hugo Brito <hugo.brito@windriver.com>
Change-Id: Iead6cfa7cad501a4c1f4a34502c0898df9ed9bbe

distributedcloud/dccommon/consts.py

@@ -83,6 +83,7 @@ ENDPOINT_TYPE_PATCHING = "patching"
 ENDPOINT_TYPE_IDENTITY = "identity"
 ENDPOINT_TYPE_FM = "faultmanagement"
 ENDPOINT_TYPE_NFV = "nfv"
+ENDPOINT_TYPE_SOFTWARE = "usm"
 ENDPOINT_TYPE_LOAD = "load"
 ENDPOINT_TYPE_DC_CERT = 'dc-cert'
 ENDPOINT_TYPE_FIRMWARE = 'firmware'

distributedcloud/dcmanager/manager/subcloud_manager.py

@@ -140,7 +140,8 @@ ENDPOINT_URLS = {
     dccommon_consts.ENDPOINT_TYPE_IDENTITY: "https://{}:5001/v3",
     dccommon_consts.ENDPOINT_TYPE_PATCHING: "https://{}:5492",
     dccommon_consts.ENDPOINT_TYPE_FM: "https://{}:18003",
-    dccommon_consts.ENDPOINT_TYPE_NFV: "https://{}:4546"
+    dccommon_consts.ENDPOINT_TYPE_NFV: "https://{}:4546",
+    dccommon_consts.ENDPOINT_TYPE_SOFTWARE: "https://{}:5498",
 }
 
 
@@ -2350,7 +2351,8 @@ class SubcloudManager(manager.Manager):
             "sysinv": "https://{}:6386/v1".format(endpoint_ip),
             "fm": "https://{}:18003".format(endpoint_ip),
             "patching": "https://{}:5492".format(endpoint_ip),
-            "vim": "https://{}:4546".format(endpoint_ip)
+            "vim": "https://{}:4546".format(endpoint_ip),
+            "usm": "https://{}:5498".format(endpoint_ip),
         }
 
         for endpoint in m_ks_client.keystone_client.endpoints.list(
@@ -2367,6 +2369,8 @@ class SubcloudManager(manager.Manager):
                 admin_endpoint_url = services_endpoints.get('fm')
             elif service_type == dccommon_consts.ENDPOINT_TYPE_NFV:
                 admin_endpoint_url = services_endpoints.get('vim')
+            elif service_type == dccommon_consts.ENDPOINT_TYPE_SOFTWARE:
+                admin_endpoint_url = services_endpoints.get('usm')
             else:
                 LOG.exception("Endpoint Type Error: %s" % service_type)
             m_ks_client.keystone_client.endpoints.update(

distributedcloud/dcmanager/tests/unit/manager/test_subcloud_manager.py

@@ -146,6 +146,10 @@ FAKE_SERVICES = [
     FakeService(
         dccommon_consts.ENDPOINT_TYPE_DC_CERT,
         6
+    ),
+    FakeService(
+        dccommon_consts.ENDPOINT_TYPE_SOFTWARE,
+        7
     )
 ]