From 220be63fa1cb572cafa673e785db85b9cf48b510 Mon Sep 17 00:00:00 2001 From: yxpoke Date: Thu, 17 Oct 2019 17:46:03 +0800 Subject: [PATCH] update modeling project docs - change toscaparser to etsicatalog Issue-ID: MODELING-228 Signed-off-by: yxpoke Change-Id: I944ada0c07d87914ad4d729c193abc863483f34e --- docs/guides/onap-developer/architecture/onap-architecture.rst | 11 +++++++---- docs/guides/onap-developer/developing/index.rst | 2 +- docs/release/releaserepos.rst | 4 ++-- docs/release/repolist.rst | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/guides/onap-developer/architecture/onap-architecture.rst b/docs/guides/onap-developer/architecture/onap-architecture.rst index ca0399ac5..b35c1aba8 100644 --- a/docs/guides/onap-developer/architecture/onap-architecture.rst +++ b/docs/guides/onap-developer/architecture/onap-architecture.rst @@ -491,7 +491,7 @@ requirements of various use cases, guide the development and bring consistency among ONAP components and explore a common model to improve the interoperability of ONAP. -In the Dublin Release, ONAP supports the following Models: +In the El Alto Release, ONAP supports the following Models: - A VNF Descriptor Information Model based on ETSI NFV IFA011 v.2.5.1 with appropriate modifications aligned with ONAP requirements @@ -506,10 +506,13 @@ In the Dublin Release, ONAP supports the following Models: modelling project parsing capabilities) - These models enable ONAP to interoperate with implementations based on standards and improve industry collaboration. +- Root model which presents the relationship between different models +- Business and Interaction model based on TMF specifications +- VES model based on VES 7.1 specification -In Dublin release, in addition to the parser library, modeling project -introduced generic parser which provide the Tosca parser restful APIs for other -projects as a standalone service. +In El Alto release, modeling project rename the generic parser into etsi catalog, +which still provide the parser functionalities, as well as additional package +management functionalities. Industry Alignment ================== diff --git a/docs/guides/onap-developer/developing/index.rst b/docs/guides/onap-developer/developing/index.rst index efb9e0d95..7bbda267b 100644 --- a/docs/guides/onap-developer/developing/index.rst +++ b/docs/guides/onap-developer/developing/index.rst @@ -195,7 +195,7 @@ Modeling :titlesonly: ../../../submodules/modeling/modelspec.git/docs/index - ../../../submodules/modeling/toscaparsers.git/docs/index + ../../../submodules/modeling/etsicatalog.git/docs/index MultiVIM Cloud -------------- diff --git a/docs/release/releaserepos.rst b/docs/release/releaserepos.rst index 3c04f1be3..343d18e61 100644 --- a/docs/release/releaserepos.rst +++ b/docs/release/releaserepos.rst @@ -139,8 +139,8 @@ Modeling :maxdepth: 1 :titlesonly: - modeling/modelspec<../submodules/modeling/toscaparsers.git/docs/javatoscachecker/release-notes.rst> - modeling/toscaparsers<../submodules/modeling/toscaparsers.git/docs/nfvparser/release-notes/release-notes.rst> + modeling/modelspec<../submodules/modeling/modelspec.git/docs/Release-notes/release-notes.rst> + modeling/etsicatalog<../submodules/modeling/etsicatalog.git/docs/release-notes.rst> Micro Services Bus ------------------ diff --git a/docs/release/repolist.rst b/docs/release/repolist.rst index 7428534cd..eaf4d4e8a 100644 --- a/docs/release/repolist.rst +++ b/docs/release/repolist.rst @@ -21,6 +21,7 @@ Project/Components HOLMES - Architecuture and APIs <../submodules/holmes/rule-management.git/docs/index> logging-analytics <../submodules/logging-analytics.git/docs/index> modeling/toscaparsers <../submodules/modeling/toscaparsers.git/docs/index> + modeling/etsicatalog <../submodules/modeling/etsicatalog.git/docs/index> MSB - Microservice Bus <../submodules/msb/apigateway.git/docs/index> msb/swagger-sdk <../submodules/msb/swagger-sdk.git/docs/index> MultiCloud Framework <../submodules/multicloud/framework.git/docs/index> -- 2.16.6