Merge pull request #8456 from mandy-chessell/oak2024

Fix server metadata
odpi · Oct 22, 2024 · 9338793 · 9338793
2 parents 65800a6 + c279a37
commit 9338793
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 24 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
diff --git a/content-packs/CocoBusinessSystemsArchive.omarchive b/content-packs/CocoBusinessSystemsArchive.omarchive
diff --git a/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive b/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
diff --git a/content-packs/CocoComboArchive.omarchive b/content-packs/CocoComboArchive.omarchive
diff --git a/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive b/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
diff --git a/content-packs/CocoGovernanceProgramArchive.omarchive b/content-packs/CocoGovernanceProgramArchive.omarchive
diff --git a/content-packs/CocoOrganizationArchive.omarchive b/content-packs/CocoOrganizationArchive.omarchive
diff --git a/content-packs/CocoSustainabilityArchive.omarchive b/content-packs/CocoSustainabilityArchive.omarchive
diff --git a/content-packs/CocoTypesArchive.omarchive b/content-packs/CocoTypesArchive.omarchive
diff --git a/.../main/java/org/odpi/openmetadata/samples/archiveutilities/SimpleCatalogArchiveHelper.java b/.../main/java/org/odpi/openmetadata/samples/archiveutilities/SimpleCatalogArchiveHelper.java
@@ -6724,6 +6724,19 @@ public Classification getServerPurposeClassification(String classificationName,
     }
 
 
+
+    /**
+     * Create a classification for an Engine software server capability.
+     *
+     * @param classificationName name of the classification
+     * @return classification
+     */
+    public Classification getEngineClassification(String classificationName)
+    {
+        return this.archiveHelper.getClassification(classificationName, null, InstanceStatus.ACTIVE);
+    }
+
+
     /**
      * Add a ServerPurpose classification to an IT Infrastructure element.
      *

diff --git a/...enmetadata/samples/archiveutilities/businesssystems/CocoBusinessSystemsArchiveWriter.java b/...enmetadata/samples/archiveutilities/businesssystems/CocoBusinessSystemsArchiveWriter.java
@@ -127,20 +127,43 @@ private void addSystems()
                 {
                     String softwareCapabilityQName = softwareCapabilityTypeName + " for " + systemDefinition.getQualifiedName();
 
-                    archiveHelper.addSoftwareCapability(softwareCapabilityTypeName,
-                                                        softwareCapabilityQName,
-                                                        softwareCapabilityQName,
-                                                        null,
-                                                        null,
-                                                        null,
-                                                        null,
-                                                        null,
-                                                        null,
-                                                        null,
-                                                        (Classification)null,
-                                                        serverGUID,
-                                                        OpenMetadataType.SOFTWARE_SERVER.typeName,
-                                                        OpenMetadataType.ASSET.typeName);
+                    if (softwareCapabilityTypeName.endsWith(OpenMetadataType.ENGINE.typeName))
+                    {
+                        Classification engineClassification = archiveHelper.getEngineClassification(softwareCapabilityTypeName);
+
+                        archiveHelper.addSoftwareCapability(OpenMetadataType.ENGINE.typeName,
+                                                            softwareCapabilityQName,
+                                                            softwareCapabilityQName,
+                                                            null,
+                                                            null,
+                                                            null,
+                                                            null,
+                                                            null,
+                                                            null,
+                                                            null,
+                                                            engineClassification,
+                                                            serverGUID,
+                                                            OpenMetadataType.SOFTWARE_SERVER.typeName,
+                                                            OpenMetadataType.ASSET.typeName);
+                    }
+                    else
+                    {
+                        archiveHelper.addSoftwareCapability(softwareCapabilityTypeName,
+                                                            softwareCapabilityQName,
+                                                            softwareCapabilityQName,
+                                                            null,
+                                                            null,
+                                                            null,
+                                                            null,
+                                                            null,
+                                                            null,
+                                                            null,
+                                                            (Classification)null,
+                                                            serverGUID,
+                                                            OpenMetadataType.SOFTWARE_SERVER.typeName,
+                                                            OpenMetadataType.ASSET.typeName);
+                    }
+
                     archiveHelper.addSupportedSoftwareCapabilityRelationship(softwareCapabilityQName,
                                                                              systemDefinition.getQualifiedName(),
                                                                              null,

diff --git a/.../org/odpi/openmetadata/samples/archiveutilities/businesssystems/SystemTypeDefinition.java b/.../org/odpi/openmetadata/samples/archiveutilities/businesssystems/SystemTypeDefinition.java
@@ -139,7 +139,7 @@ public enum SystemTypeDefinition
                 "UI server supplying UI code (javascript/typescript) to the browser.",
                 "These servers are part of a middleware deployment.",
                 null,
-                "null"),
+                null),
 
     /**
      * cloud-saas-service - Application or service hosted by an external cloud provider.