extend noramtive: dbms.image, machine, remote.machine, local.machine (#…

…397)

docs/docs/assets/documents/dependencies.csv

@@ -174,7 +174,7 @@
 "[email protected]","MIT","https://github.com/jshttp/on-finished"
 "[email protected]","ISC","https://github.com/isaacs/once"
 "[email protected]","MIT","https://github.com/sindresorhus/open"
-"[email protected].4","Apache-2.0","https://github.com/OpenTOSCA/opentosca-vintner"
+"[email protected].5","Apache-2.0","https://github.com/OpenTOSCA/opentosca-vintner"
 "[email protected]","MIT","https://github.com/sindresorhus/os-tmpdir"
 "[email protected]","MIT","https://github.com/mholt/PapaParse"
 "[email protected]","MIT","https://github.com/pillarjs/parseurl"

docs/docs/dependencies.md

@@ -188,7 +188,7 @@ We ensure, that only the licenses 0BSD, Apache-2.0, BSD-2-Clause, BSD-3-Clause,
 | 173  | [email protected] | MIT | [https://github.com/jshttp/on-finished](https://github.com/jshttp/on-finished){target=_blank} |
 | 174  | [email protected] | ISC | [https://github.com/isaacs/once](https://github.com/isaacs/once){target=_blank} |
 | 175  | [email protected] | MIT | [https://github.com/sindresorhus/open](https://github.com/sindresorhus/open){target=_blank} |
-| 176  | [email protected].4 | Apache-2.0 | [https://github.com/OpenTOSCA/opentosca-vintner](https://github.com/OpenTOSCA/opentosca-vintner){target=_blank} |
+| 176  | [email protected].5 | Apache-2.0 | [https://github.com/OpenTOSCA/opentosca-vintner](https://github.com/OpenTOSCA/opentosca-vintner){target=_blank} |
 | 177  | [email protected] | MIT | [https://github.com/sindresorhus/os-tmpdir](https://github.com/sindresorhus/os-tmpdir){target=_blank} |
 | 178  | [email protected] | MIT | [https://github.com/mholt/PapaParse](https://github.com/mholt/PapaParse){target=_blank} |
 | 179  | [email protected] | MIT | [https://github.com/pillarjs/parseurl](https://github.com/pillarjs/parseurl){target=_blank} |

docs/docs/edmm/index.md

@@ -32,20 +32,20 @@ The specification is under active development and is not backwards compatible wi
 
 1. A `software.application` node template always requires a `source.archive` or `system.package` deployment artifact.
 1. A `software.application` node template with an `source.archive` deployment artifact always requires the `start` operation and the `stop` operation.
-1. A `software.application` node template with a `source.archive` deployment artifact implicitly requires an `virtual.machine` or `gcp.appengine` node template as host.
-1. A `software.application` node template with a `system.package` deployment artifact implicitly requires an `virtual.machine` node template as host.
+1. A `software.application` node template with a `source.archive` deployment artifact implicitly requires an `remote.machine` or `gcp.appengine` node template as host.
+1. A `software.application` node template with a `system.package` deployment artifact implicitly requires an `remote.machine` node template as host.
 
 
 ## Service Applications
 
-1. A `service.application` node template on a `virtual.machine` host is started as `systemd` service.
+1. A `service.application` node template on a `remote.machine` host is started as `systemd` service.
 1. A `service.appcliation` always requires a  `source.archive` or `container.image` deployment artifact. 
 1. A `service.application` does not require a `stop` operation.
 1. A `service.application` node template with a `container.image` deployment artifact implicitly requires a `docker.engine`, `gcp.cloudrun`, or `kubernetes` node template as host.
 
 ## Virtual Machine 
 
-1. A `virtual.machine` node template always requires a `machine.image` deployment artifact.
+1. A `remote.machine` node template always requires a `machine.image` deployment artifact.
 
 ## Management Operations
 
@@ -73,7 +73,7 @@ The specification is under active development and is not backwards compatible wi
 
 ## Application Directory
 
-1. A `software.application` node template hosted on a `virtual.machine` node template has its own dedicated application directory.
+1. A `software.application` node template hosted on a `remote.machine` node template has its own dedicated application directory.
 1. The `.vintner` directory is a reserved directory in the application directory.
 
 

docs/docs/normative/index.md

@@ -135,6 +135,17 @@ machine.image:
         vintner_normative: 'true'
 ```
 
+#### dbms.image
+
+expects image reference in "file"
+
+```yaml linenums="1"
+dbms.image:
+    derived_from: artifact
+    metadata:
+        vintner_normative: 'true'
+```
+
 ### Interface Types
 
 We specify the following normative interface types.
@@ -309,50 +320,42 @@ container.runtime:
         vintner_abstract: 'true'
 ```
 
-#### virtual.machine
+#### machine
 
 
 
 ```yaml linenums="1"
-virtual.machine:
+machine:
     derived_from: node
     metadata:
         vintner_normative: 'true'
+        vintner_abstract: 'true'
     properties:
         machine_name:
             type: string
-        ports:
-            type: list
-            entry_schema:
-                type: string
-        flavor:
-            type: string
-            default: m1.medium
-        network:
-            type: string
-        ssh_user:
-            type: string
-        ssh_key_name:
-            type: string
-        ssh_key_file:
-            type: string
-    attributes:
-        management_address:
-            type: string
-        application_address:
-            type: string
+```
+
+#### local.machine
+
+
+
+```yaml linenums="1"
+local.machine:
+    derived_from: machine
+    metadata:
+        vintner_normative: 'true'
     capabilities:
         host:
             type: tosca.capabilities.Compute
 ```
 
-#### physical.machine
+#### remote.machine
 
 
 
 ```yaml linenums="1"
-physical.machine:
-    derived_from: node
+remote.machine:
+    derived_from: machine
     metadata:
         vintner_normative: 'true'
     properties:
@@ -383,6 +386,24 @@ physical.machine:
             type: tosca.capabilities.Compute
 ```
 
+#### virtual.machine
+
+
+
+```yaml linenums="1"
+virtual.machine:
+    derived_from: remote.machine
+```
+
+#### physical.machine
+
+
+
+```yaml linenums="1"
+physical.machine:
+    derived_from: remote.machine
+```
+
 #### database
 
 
@@ -998,9 +1019,6 @@ mysql.dbms:
             type: string
         application_name:
             type: string
-        dbms_version:
-            type: string
-            default: '5.7'
         dbms_password:
             type: string
         dbms_ssl_mode: