Commit dfcb7b0a authored by Francisco-Javier Ramon Salguero's avatar Francisco-Javier Ramon Salguero
Browse files

Merge branch 'im-update' into 'master'

Updating IM doc for Rel SEVEN

See merge request !24
parents 98a3b91d 716bd133
Loading
Loading
Loading
Loading
+164 −62
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Below you can find tree representations of the VNFD (VNF Descriptor), NSD (Netwo

**Navigable version:**

**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSIX/docs/osm-im/osm_im_trees/vnfd.html>**
**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSEVEN/docs/osm-im/osm_im_trees/vnfd.html>**

**Plain text version:**

@@ -39,10 +39,6 @@ module: vnfd
        |  |     +--rw juju
        |  |        +--rw charm?   string
        |  |        +--rw proxy?   boolean
        |  |        +--rw vca-relationships
        |  |           +--rw relation* [requires provides]
        |  |              +--rw requires    string
        |  |              +--rw provides    string
        |  +--rw config-primitive* [name]
        |  |  +--rw name                   string
        |  |  +--rw parameter* [name]
@@ -74,6 +70,11 @@ module: vnfd
        |  |  +--rw user-defined-script?   string
        |  +--rw metrics* [name]
        |  |  +--rw name    string
        |  +--rw relation* [name]
        |  |  +--rw name        string
        |  |  +--rw entities* [id]
        |  |     +--rw id          string
        |  |     +--rw endpoint?   string
        |  +--rw config-access
        |     +--rw ssh-access
        |        +--rw required?       boolean
@@ -248,10 +249,6 @@ module: vnfd
        |  |  |     +--rw juju
        |  |  |        +--rw charm?   string
        |  |  |        +--rw proxy?   boolean
        |  |  |        +--rw vca-relationships
        |  |  |           +--rw relation* [requires provides]
        |  |  |              +--rw requires    string
        |  |  |              +--rw provides    string
        |  |  +--rw config-primitive* [name]
        |  |  |  +--rw name                   string
        |  |  |  +--rw parameter* [name]
@@ -332,6 +329,65 @@ module: vnfd
        |     |     +--rw image-checksum?   string
        |     +--rw device-bus?             enumeration
        |     +--rw device-type?            enumeration
        +--rw kdu* [name]
        |  +--rw name                 string
        |  +--rw description?         string
        |  +--rw kdu-configuration
        |  |  +--rw (config-method)?
        |  |  |  +--:(script)
        |  |  |  |  +--rw script
        |  |  |  |     +--rw script-type?   enumeration
        |  |  |  +--:(juju)
        |  |  |     +--rw juju
        |  |  |        +--rw charm?   string
        |  |  |        +--rw proxy?   boolean
        |  |  +--rw config-primitive* [name]
        |  |  |  +--rw name                   string
        |  |  |  +--rw parameter* [name]
        |  |  |  |  +--rw name              string
        |  |  |  |  +--rw data-type?        manotypes:parameter-data-type
        |  |  |  |  +--rw mandatory?        boolean
        |  |  |  |  +--rw default-value?    string
        |  |  |  |  +--rw parameter-pool?   string
        |  |  |  |  +--rw read-only?        boolean
        |  |  |  |  +--rw hidden?           boolean
        |  |  |  +--rw user-defined-script?   string
        |  |  +--rw initial-config-primitive* [seq]
        |  |  |  +--rw seq                          uint64
        |  |  |  +--rw (primitive-type)?
        |  |  |     +--:(primitive-definition)
        |  |  |        +--rw name?                  string
        |  |  |        +--rw parameter* [name]
        |  |  |        |  +--rw name         string
        |  |  |        |  +--rw data-type?   manotypes:parameter-data-type
        |  |  |        |  +--rw value?       string
        |  |  |        +--rw user-defined-script?   string
        |  |  +--rw terminate-config-primitive* [seq]
        |  |  |  +--rw seq                    uint64
        |  |  |  +--rw name?                  string
        |  |  |  +--rw parameter* [name]
        |  |  |  |  +--rw name         string
        |  |  |  |  +--rw data-type?   manotypes:parameter-data-type
        |  |  |  |  +--rw value?       string
        |  |  |  +--rw user-defined-script?   string
        |  |  +--rw metrics* [name]
        |  |  |  +--rw name    string
        |  |  +--rw config-access
        |  |  |  +--rw ssh-access
        |  |  |     +--rw required?       boolean
        |  |  |     +--rw default-user?   string
        |  |  +--rw blacklist-config-primitive*   enumeration
        |  +--rw (kdu-model)?
        |     +--:(helm-chart)
        |     |  +--rw helm-chart?    string
        |     +--:(juju-bundle)
        |        +--rw juju-bundle?   string
        +--rw k8s-cluster
        |  +--rw version*   string
        |  +--rw cni*       enumeration
        |  +--rw nets* [id]
        |     +--rw id                               string
        |     +--rw external-connection-point-ref?   -> ../../../connection-point/name
        +--rw vdu-dependency* [vdu-source-ref]
        |  +--rw vdu-source-ref        -> ../../vdu/id
        |  +--rw vdu-depends-on-ref?   -> ../../vdu/id
@@ -420,7 +476,7 @@ module: vnfd

**Navigable version:**

**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSIX/docs/osm-im/osm_im_trees/nsd.html>**
**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSEVEN/docs/osm-im/osm_im_trees/nsd.html>**

**Plain text version:**

@@ -526,10 +582,6 @@ module: nsd
        |  |     +--rw juju
        |  |        +--rw charm?   string
        |  |        +--rw proxy?   boolean
        |  |        +--rw vca-relationships
        |  |           +--rw relation* [requires provides]
        |  |              +--rw requires    string
        |  |              +--rw provides    string
        |  +--rw config-primitive* [name]
        |  |  +--rw name                   string
        |  |  +--rw parameter* [name]
@@ -560,7 +612,12 @@ module: nsd
        |  |  |  +--rw value?       string
        |  |  +--rw user-defined-script?   string
        |  +--rw metrics* [name]
        |  |  +--rw name    string
        |  +--rw relation* [name]
        |     +--rw name        string
        |     +--rw entities* [id]
        |        +--rw id          string
        |        +--rw endpoint?   string
        +--rw input-parameter-xpath* [xpath]
        |  +--rw xpath            string
        |  +--rw label?           string
@@ -645,7 +702,7 @@ module: nsd

**Navigable version:**

**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSIX/docs/osm-im/osm_im_trees/nst.html>**
**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSEVEN/docs/osm-im/osm_im_trees/nst.html>**

**Plain text version:**

@@ -778,7 +835,7 @@ module: nst

**Navigable version:**

**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSIX/docs/osm-im/osm_im_trees/vnfr.html>**
**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSEVEN/docs/osm-im/osm_im_trees/vnfr.html>**

**Plain text version:**

@@ -816,10 +873,6 @@ module: vnfr
          |  |  |     +--ro juju
          |  |  |        +--ro charm?   string
          |  |  |        +--ro proxy?   boolean
          |  |  |        +--ro vca-relationships
          |  |  |           +--ro relation* [requires provides]
          |  |  |              +--ro requires    string
          |  |  |              +--ro provides    string
          |  |  +--ro config-primitive* [name]
          |  |  |  +--ro name                   string
          |  |  |  +--ro parameter* [name]
@@ -851,6 +904,11 @@ module: vnfr
          |  |  |  +--ro user-defined-script?   string
          |  |  +--ro metrics* [name]
          |  |  |  +--ro name    string
          |  |  +--ro relation* [name]
          |  |  |  +--ro name        string
          |  |  |  +--ro entities* [id]
          |  |  |     +--ro id          string
          |  |  |     +--ro endpoint?   string
          |  |  +--ro config-access
          |  |     +--ro ssh-access
          |  |        +--ro required?       boolean
@@ -1025,10 +1083,6 @@ module: vnfr
          |  |  |  |     +--ro juju
          |  |  |  |        +--ro charm?   string
          |  |  |  |        +--ro proxy?   boolean
          |  |  |  |        +--ro vca-relationships
          |  |  |  |           +--ro relation* [requires provides]
          |  |  |  |              +--ro requires    string
          |  |  |  |              +--ro provides    string
          |  |  |  +--ro config-primitive* [name]
          |  |  |  |  +--ro name                   string
          |  |  |  |  +--ro parameter* [name]
@@ -1109,6 +1163,65 @@ module: vnfr
          |  |     |     +--ro image-checksum?   string
          |  |     +--ro device-bus?             enumeration
          |  |     +--ro device-type?            enumeration
          |  +--ro kdu* [name]
          |  |  +--ro name                 string
          |  |  +--ro description?         string
          |  |  +--ro kdu-configuration
          |  |  |  +--ro (config-method)?
          |  |  |  |  +--:(script)
          |  |  |  |  |  +--ro script
          |  |  |  |  |     +--ro script-type?   enumeration
          |  |  |  |  +--:(juju)
          |  |  |  |     +--ro juju
          |  |  |  |        +--ro charm?   string
          |  |  |  |        +--ro proxy?   boolean
          |  |  |  +--ro config-primitive* [name]
          |  |  |  |  +--ro name                   string
          |  |  |  |  +--ro parameter* [name]
          |  |  |  |  |  +--ro name              string
          |  |  |  |  |  +--ro data-type?        manotypes:parameter-data-type
          |  |  |  |  |  +--ro mandatory?        boolean
          |  |  |  |  |  +--ro default-value?    string
          |  |  |  |  |  +--ro parameter-pool?   string
          |  |  |  |  |  +--ro read-only?        boolean
          |  |  |  |  |  +--ro hidden?           boolean
          |  |  |  |  +--ro user-defined-script?   string
          |  |  |  +--ro initial-config-primitive* [seq]
          |  |  |  |  +--ro seq                          uint64
          |  |  |  |  +--ro (primitive-type)?
          |  |  |  |     +--:(primitive-definition)
          |  |  |  |        +--ro name?                  string
          |  |  |  |        +--ro parameter* [name]
          |  |  |  |        |  +--ro name         string
          |  |  |  |        |  +--ro data-type?   manotypes:parameter-data-type
          |  |  |  |        |  +--ro value?       string
          |  |  |  |        +--ro user-defined-script?   string
          |  |  |  +--ro terminate-config-primitive* [seq]
          |  |  |  |  +--ro seq                    uint64
          |  |  |  |  +--ro name?                  string
          |  |  |  |  +--ro parameter* [name]
          |  |  |  |  |  +--ro name         string
          |  |  |  |  |  +--ro data-type?   manotypes:parameter-data-type
          |  |  |  |  |  +--ro value?       string
          |  |  |  |  +--ro user-defined-script?   string
          |  |  |  +--ro metrics* [name]
          |  |  |  |  +--ro name    string
          |  |  |  +--ro config-access
          |  |  |  |  +--ro ssh-access
          |  |  |  |     +--ro required?       boolean
          |  |  |  |     +--ro default-user?   string
          |  |  |  +--ro blacklist-config-primitive*   enumeration
          |  |  +--ro (kdu-model)?
          |  |     +--:(helm-chart)
          |  |     |  +--ro helm-chart?    string
          |  |     +--:(juju-bundle)
          |  |        +--ro juju-bundle?   string
          |  +--ro k8s-cluster
          |  |  +--ro version*   string
          |  |  +--ro cni*       enumeration
          |  |  +--ro nets* [id]
          |  |     +--ro id                               string
          |  |     +--ro external-connection-point-ref?   -> ../../../connection-point/name
          |  +--ro vdu-dependency* [vdu-source-ref]
          |  |  +--ro vdu-source-ref        -> ../../vdu/id
          |  |  +--ro vdu-depends-on-ref?   -> ../../vdu/id
@@ -1201,10 +1314,6 @@ module: vnfr
          |  |     +--ro juju
          |  |        +--ro charm?   string
          |  |        +--ro proxy?   boolean
          |  |        +--ro vca-relationships
          |  |           +--ro relation* [requires provides]
          |  |              +--ro requires    string
          |  |              +--ro provides    string
          |  +--ro config-primitive* [name]
          |  |  +--ro name                   string
          |  |  +--ro parameter* [name]
@@ -1358,10 +1467,6 @@ module: vnfr
          |  |  |     +--ro juju
          |  |  |        +--ro charm?   string
          |  |  |        +--ro proxy?   boolean
          |  |  |        +--ro vca-relationships
          |  |  |           +--ro relation* [requires provides]
          |  |  |              +--ro requires    string
          |  |  |              +--ro provides    string
          |  |  +--ro config-primitive* [name]
          |  |  |  +--ro name                   string
          |  |  |  +--ro parameter* [name]
@@ -1527,7 +1632,7 @@ module: vnfr

**Navigable version:**

**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSIX/docs/osm-im/osm_im_trees/nsr.html>**
**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSEVEN/docs/osm-im/osm_im_trees/nsr.html>**

**Plain text version:**

@@ -1644,10 +1749,6 @@ module: nsr
          |  |  |     +--rw juju
          |  |  |        +--rw charm?   string
          |  |  |        +--rw proxy?   boolean
          |  |  |        +--rw vca-relationships
          |  |  |           +--rw relation* [requires provides]
          |  |  |              +--rw requires    string
          |  |  |              +--rw provides    string
          |  |  +--rw config-primitive* [name]
          |  |  |  +--rw name                   string
          |  |  |  +--rw parameter* [name]
@@ -1678,7 +1779,12 @@ module: nsr
          |  |  |  |  +--rw value?       string
          |  |  |  +--rw user-defined-script?   string
          |  |  +--rw metrics* [name]
          |  |  |  +--rw name    string
          |  |  +--rw relation* [name]
          |  |     +--rw name        string
          |  |     +--rw entities* [id]
          |  |        +--rw id          string
          |  |        +--rw endpoint?   string
          |  +--rw input-parameter-xpath* [xpath]
          |  |  +--rw xpath            string
          |  |  +--rw label?           string
@@ -1903,10 +2009,6 @@ module: nsr
          |  |     +--ro juju
          |  |        +--ro charm?   string
          |  |        +--ro proxy?   boolean
          |  |        +--ro vca-relationships
          |  |           +--ro relation* [requires provides]
          |  |              +--ro requires    string
          |  |              +--ro provides    string
          |  +--ro config-primitive* [name]
          |  |  +--ro name                   string
          |  |  +--ro parameter* [name]
@@ -2161,7 +2263,7 @@ module: nsr

**Navigable version:**

**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSIX/docs/osm-im/osm_im_trees/nsi.html>**
**<http://osm-download.etsi.org/repository/osm/debian/ReleaseSEVEN/docs/osm-im/osm_im_trees/nsi.html>**

**Plain text version:**