adapt puml styling (#399)

OpenTOSCA · Sep 4, 2024 · 9390da2 · 9390da2
1 parent 35b51af
commit 9390da2
Show file tree

Hide file tree

Showing 6 changed files with 150 additions and 120 deletions.
diff --git a/docs/docs/variability4tosca/rules/index.md b/docs/docs/variability4tosca/rules/index.md
diff --git a/src/assets/templates/puml/topology/artifact.template.ejs b/src/assets/templates/puml/topology/artifact.template.ejs
@@ -2,4 +2,4 @@ file "<%= puml.toText(artifact) %>" as <%= puml.toId(artifact) %>
 <% if(puml.hasLink(artifact)) {-%>
 url of <%= puml.toId(artifact) %> is [[ <%= puml.getLink(artifact) %> ]]
 <% } -%>
-<%= puml.toId(artifact) %> - <%= puml.toId(artifact.container) %>
+<%= puml.toId(artifact) %> . <%= puml.toId(artifact.container) %>
diff --git a/src/assets/templates/puml/topology/node.template.ejs b/src/assets/templates/puml/topology/node.template.ejs
@@ -1,4 +1,8 @@
-rectangle "<%= puml.toText(node) %>" as <%= puml.toId(node) -%><%= puml.isAsterisk(node) ? ' #line.dashed' : '' -%>
+<% if (puml.isAsterisk(node)) { -%>
+rectangle "..." as <%= puml.toId(node) -%> #white;line.dotted -%>
+<% } else { -%>
+rectangle "<%= puml.toText(node) %>" as <%= puml.toId(node) -%>
+<% } -%>
 
 <% if(puml.hasLink(node)) {-%>
 url of <%= puml.toId(node) %> is [[ <%= puml.getLink(node) %> ]]

diff --git a/src/assets/templates/puml/topology/template.template.ejs b/src/assets/templates/puml/topology/template.template.ejs
@@ -7,6 +7,7 @@ skinparam ArrowThickness 1.5
 skinparam file {
     BorderColor black
     BorderThickness 1.5
+    BackgroundColor white
 }
 
 skinparam interface {

diff --git a/tasks/docs/generate/rules/template.ejs b/tasks/docs/generate/rules/template.ejs
@@ -53,14 +53,15 @@ We assess the deployment quality of the following scenarios.
 
 ### Scenario #<%= index + 1 %>
 
-A node template whose node type is or is derived from the node type <%= link(group.component) -%>
+In this scenario, the node template "component" of node type <%= link(group.component) -%> is deployed.
 <% if (group.artifact) { -%>
- and which has an artifact whose artifact type is or is derived from <%= link(group.artifact) -%>,
+This node template is implemented by its deployment artifact "artifact" of artifact type <%= link(group.artifact) -%>.
 <% } -%>
 <% if (group.hosting.length !== 0) { -%>
- and which <%- group.hosting.map(it => it === "*" ? "is hosted on an arbitrary hosting stack" : `is hosted on a node template whose node type is or is derived from ${link(it)}`).join(", which ") -%>
+The node template <%- group.hosting.map((type, index) => type === "*" ? "is hosted on an arbitrary hosting stack of arbitrary length" : `is hosted on the node template "host ${index + 1}" of node type ${link(type)}`).join(", which ") -%>.
+<% } else { -%>
+The scenario does not require a specific hosting.
 <% } -%>
-.
 
 <figure markdown><%- group.svg %></figure>
 

diff --git a/tests/puml/topology/service-template.topology.puml b/tests/puml/topology/service-template.topology.puml
@@ -7,6 +7,7 @@ skinparam ArrowThickness 1.5
 skinparam file {
     BorderColor black
     BorderThickness 1.5
+    BackgroundColor white
 }
 
 skinparam interface {
@@ -26,7 +27,7 @@ rectangle "application\n(example.nodes.Application)" as node_application
 url of node_application is [[ https://vintner.opentosca.org ]]
 file "tar_archive\n(tar.archive)" as artifact_tar_archive_0_node_application
 url of artifact_tar_archive_0_node_application is [[ https://vintner.opentosca.org ]]
-artifact_tar_archive_0_node_application - node_application
+artifact_tar_archive_0_node_application . node_application
 
 rectangle "runtime\n(example.nodes.Runtime)" as node_runtime
 
@@ -40,7 +41,7 @@ rectangle "dbms\n(example.nodes.DBMS)" as node_dbms
 
 rectangle "compute\n(example.nodes.Compute)" as node_compute
 
-rectangle "hosting\n(*)" as node_hosting #line.dashed
+rectangle "..." as node_hosting #white;line.dotted
 
 rectangle "provider\n(some.provider)" as node_provider