diff --git a/doc/architecture/nfvweb.md b/doc/architecture/nfvweb.md
deleted file mode 100644
index b96dee34a9662e14f4c5eb3f41f507817686b094..0000000000000000000000000000000000000000
--- a/doc/architecture/nfvweb.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Openslice NFV Web Portal
-
-The [NFV Web Portal](http://portal.openslice.io/nfvportal) offers a domain-specific UI to manage NFV Services.
-
-Indicatively, the portal can be used to:
-- Register new a new MANO provider (e.g. OSM)
-- Synchronize the onboarded VNF/NS packages, and the VIMs of the registered MANO provider
-- Onboard/Delete VNF/NS packages on specific MANO provider
-- Deploy a NS to a target MANO provider
-
-More information can be found at [NFV Services](../nfvcatalogs.md).
\ No newline at end of file
diff --git a/doc/config_intro.md b/doc/config_intro.md
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c3549c1554349b33b949f361341d15cbb7bbd500 100644
--- a/doc/config_intro.md
+++ b/doc/config_intro.md
@@ -0,0 +1,9 @@
+# Configuring and managing OpenSlice
+
+## Intended Audience: OpenSlice administrators
+
+This section provides information on how to configure and manage different aspect of OpenSlice while in operation. For example:
+
+* Manage user roles and access in Keycloak
+* Configure/Manage NFVOs
+* Advanced configuration scenarios
\ No newline at end of file
diff --git a/doc/naas/introduction.md b/doc/naas/introduction.md
index 12d4a9396a2c591a126f7748957a330e67ad520b..469b19ebf1985f368b6f04ada0a5fc45d4e6ffec 100644
--- a/doc/naas/introduction.md
+++ b/doc/naas/introduction.md
@@ -1,6 +1,7 @@
# Network as a Service (NaaS)
-This section describes some core concepts for Delivering Network as a Service in OpenSlice. There are many articles and reports on the subject like
+This section describes some core concepts for Delivering Network as a Service in OpenSlice. There are many articles and reports on the subject like:
+
* TMF909 API Suite Specification for NaaS
* TMF926A Connectivity_as_a_Service
* TMF931-Open_Gateway_Onboarding_and_Ordering_Component_Suite
@@ -15,4 +16,8 @@ OpenSlice makes extensive use of TMFORUM's models and APIs. Therefore if one is
To deliver NaaS we need to incorporate various APIs (see TMF909 API Suite Specification for NaaS). OpenSlice implements various TMF APIs to deliver NaaS and support the lifecycle functions required to manage the network capabilities exposed as Network as a Service and managed by operational domains.
-For a complete list of supported APIs, see [Supported APIs](exposed_apis.md)
\ No newline at end of file
+
+## What's next
+
+* For a complete list of supported APIs, see [Supported APIs](exposed_apis.md)
+* Check the defined user roles of OpenSlice in our [Terminology](../terminology.md)
\ No newline at end of file
diff --git a/doc/nfvcatalogs.md b/doc/naas/nfv/nfvservices.md
similarity index 100%
rename from doc/nfvcatalogs.md
rename to doc/naas/nfv/nfvservices.md
diff --git a/doc/naas/service_catalog.md b/doc/naas/service_catalog.md
index 01663a9e39a555dbf52ee33028bd0f8e7fd04512..36b2623a8dbb04307847314fa4187e20fb2699b7 100644
--- a/doc/naas/service_catalog.md
+++ b/doc/naas/service_catalog.md
@@ -1,16 +1,40 @@
# OpenSlice Service Catalogs
+OpenSlice offers complete management of Service Catalogs.
+
+## Intended Audience: Service Designers, OpenSlice administrators
+
+
OpenSlice offers complete management of Service Catalogs which offer to end users:
+
* Service categories: Lists the available services, including their specifications and performance metrics.
* Service Bundles: Combines multiple services into a single offering to provide added value to customers.
+Service Catalogs contain Service Specifications (organized in Service Categories) exposed to users for Service Orders.
+
+
+## UI management
-Service Catalogs contain Service Specifications exposed to users for Service Orders.
+In the UI this looks like the following. Service catalogs and categories exposed in Service marketplace.
-In the UI this looks like this
+In the menu the administrator can manage the Service Catalogs and Categories.
+[](./service_catalog/img01.png)
+## API exposed
+
+When installing OpenSlice the API endpoints can be browsed at:
+```
+[YOURDOMAIN]/tmf-api/swagger-ui/index.html?urls.primaryName=tmf-api-633-ServiceCatalogManagement-v4.0.0
+
+endpoint examples:
+
+/serviceCatalogManagement/v4/serviceCatalog List or find ServiceCatalog objects
+/serviceCatalogManagement/v4/serviceCategory List or find ServiceCategory objects
+
+```
+
## Example Use Case
Scenario: A service provider wants to offer a new managed XXXX service to enterprise customers.
@@ -20,3 +44,8 @@ Scenario: A service provider wants to offer a new managed XXXX service to enterp
* Service Delivery/Order: Provision Service by Using the orchestration system to provision and configure the XXXX service based on customer orders.
+## What's next
+
+* Read the model of Service Catalogs in TMF [TMF633 Service Catalog API User Guide v4.0.0](https://www.tmforum.org/resources/specification/tmf633-service-catalog-api-user-guide-v4-0-0/)
+* Check a demo of the API [here](http://portal.openslice.io/tmf-api/swagger-ui/index.html?urls.primaryName=tmf-api-633-ServiceCatalogManagement-v4.0.0)
+* Check a demo of the Catalog and Categories [here](http://portal.openslice.io)
\ No newline at end of file
diff --git a/doc/naas/service_catalog/img01.png b/doc/naas/service_catalog/img01.png
new file mode 100644
index 0000000000000000000000000000000000000000..84e3830dd98c49ff6177f914e84ea82b027e5410
Binary files /dev/null and b/doc/naas/service_catalog/img01.png differ
diff --git a/doc/naas/service_spec.md b/doc/naas/service_spec.md
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ffff5eafee49d74ecbd15c40b00b45d373455d67 100644
--- a/doc/naas/service_spec.md
+++ b/doc/naas/service_spec.md
@@ -0,0 +1,77 @@
+# OpenSlice Service Specification
+
+OpenSlice offers complete management of Service Specifications.
+
+## Intended Audience: Service Designers
+
+Service Specification is an he entity that describes a service offering. There are two types of Service Specifications:
+
+* Resource Facing Service Specification
+* Customer Facing Service Specification
+
+## Resource Facing Service Specification
+
+Is a Service that It exposes a resource Specification as a Service. (For example expose a Network Service Descriptor as a Service)
+
+## Customer Facing Service Specification
+
+Customer Facing Service Specifications - or also CFSSpec (organized in Service Categories) are exposed to users for Service Orders. Usually it exposes other CFSSpec(as a Service Bundle) or other RFSSpecs
+
+## Definition
+
+Usually a Service Specification has the following aspects:
+
+* Name, Description, Version
+* Marked as a Service Bundle: Combines multiple services into a single offering to provide added value to customers.
+ * if is is a Bundle then you must add Related Service Specifications
+* If it is a Resource Facing Service Specification has multiple related Resource Facing Service Specifications
+* Characteristics: a list of service characteristics and their type (TEXT, INTEGER, etc)
+ * Also they can be exposed as "Configurable" so to allow to end-users during the Service Order to select or type values
+* A logo, displayed if needed in the Service Marketplace
+* Any attachments that further help the user
+* Life Cycle Rules that determine the behavior of the Service and instrument the Service Orchestrator. More on Life Cycle Rules [here](./lcm_rules_intro.md)
+
+Service Designers can create a Service Specification from scratch or use some templates:
+
+ * Create a Service based from a Network Service Descriptor (NSD)
+ * Create a Service based on a Kubernetes Operator
+ * Create a Service based on the GSMA GST - Generic Slice Template
+
+## UI management
+
+In the UI this looks like the following.
+
+In the menu the administrator can manage the Service Specifications.
+
+[](./service_catalog/img01.png)
+
+
+
+
+
+## API exposed
+
+When installing OpenSlice the API endpoints can be browsed at:
+```
+[YOURDOMAIN]/tmf-api/swagger-ui/index.html?urls.primaryName=tmf-api-633-ServiceCatalogManagement-v4.0.0
+```
+
+endpoint examples:
+
+/serviceCatalogManagement/v4/serviceSpecification List or find ServiceSpecification objects
+
+
+
+## Example Use Case
+
+Scenario: A service provider wants to offer a new managed XXXX service to enterprise customers.
+
+ * Service Definition: SCreate a service specification template for the XXXX service, including specifications for bandwidth, network features, and performance metrics.
+
+
+## What's next
+
+* Read the model of Service Catalogs in TMF [TMF633 Service Catalog API User Guide v4.0.0](https://www.tmforum.org/resources/specification/tmf633-service-catalog-api-user-guide-v4-0-0/)
+* Check a demo of the API [here](http://portal.openslice.io/tmf-api/swagger-ui/index.html?urls.primaryName=tmf-api-633-ServiceCatalogManagement-v4.0.0)
+* Check a demo of the Service Specifications in Catalog and Categories [here](http://portal.openslice.io) (You need to login - see main guide page)
+* Check the GSMA GST
\ No newline at end of file
diff --git a/doc/architecture/tmfweb.md b/doc/portals_intro.md
similarity index 69%
rename from doc/architecture/tmfweb.md
rename to doc/portals_intro.md
index 729eed65fa1833982885623ca9108e67b44ab20c..0f0d53c25d96ebd121fcd71414f7002104dc11df 100644
--- a/doc/architecture/tmfweb.md
+++ b/doc/portals_intro.md
@@ -1,13 +1,14 @@
-# Openslice TMF Web Portal
+# OpenSlice Portals
-Openslice comprises of a [web landing page](http://portal.openslice.io/) that navigates to the respective TMF Portal.
+Openslice comprises of a web landing page [See Demo](http://portal.openslice.io/) that navigates to the respective Portal:
-- [Services Portal](http://portal.openslice.io/services)
-- [Products Portal](http://portal.openslice.io/products)
-- [Testing Portal](http://portal.openslice.io/testing)
-- [Resources Portal](http://portal.openslice.io/resources)
+- Services Portal [See Demo](http://portal.openslice.io/services)
+- NFV Portal [See Demo](http://portal.openslice.io/nfvportal)
+- Products Portal [See Demo](http://portal.openslice.io/products)
+- Testing Portal [See Demo](http://portal.openslice.io/testing)
+- Resources Portal [See Demo](http://portal.openslice.io/resources)
+-
-The landing page and the TMF portals (Services, Products, Testing, Resources) are written in Angular and are maintained under the same Angular project.
Following you may find the scope each portal focuses on and the main TMF APIs it supports.
@@ -15,6 +16,18 @@ Following you may find the scope each portal focuses on and the main TMF APIs it
- Service Designer - To design Customer Facing Services as bundles of Resource Facing Services that map to specific Resourses (e.g. NFV, Testing, General Resources). Then, it is charged with the designed Services' exposure to public Service Catalogs.
- Service Customer - To browse the public Service Catalogs and order the offered Services. The fulfilment process of the Service Order is also captured and the final deployed Services are exposed to the Customer.
+**NFV Portal** is a designated portal for the:
+Indicatively, the portal can be used to:
+- Register new a new MANO provider (e.g. OSM)
+- Synchronize the onboarded VNF/NS packages, and the VIMs of the registered MANO provider
+- Onboard/Delete VNF/NS packages on specific MANO provider
+- Deploy a NS to a target MANO provider
+
+More information can be found at [NFV Services](./naas/nfv/nfvservices.md).
+
+**Resources Portal** is a designated portal for the:
+- Resource Administrator - To view the available Resources that are being synchronized from the underlying infrastructure.
+-
**Products Portal** is a designated portal for the:
- Product Designer - To design Products as bundles of available Services. Then, it is charged with the designed Products' exposure to public Product Catalogs.
- Product Customer - To browse the public Product Catalogs and navigate to the respective offered Services.
@@ -22,9 +35,6 @@ Following you may find the scope each portal focuses on and the main TMF APIs it
**Testing Portal** is a designated portal for the:
- Testing Designer - To design Tests and provide the testing scripts as attachments to the latter. The Tests can be imported as Services at the Services Portal, and can be included in a Service Bundle.
-**Resources Portal** is a designated portal for the:
-- Resource Administrator - To view the available Resources that are being synchronized from the underlying infrastructure.
-
@@ -35,5 +45,4 @@ Following you may find the scope each portal focuses on and the main TMF APIs it
|**Testing Portal** | |x | | | | | | | |x | |
|**Resources Portal** | |x | |x | |x | | | | |x |
-
-From the landing page, the user can also navigate towards the NFV portal. See [NFV WEB](./nfvweb.md).
\ No newline at end of file
+The NFV Portal uses a proprietary API
\ No newline at end of file
diff --git a/doc/role_keycloak_management.md b/doc/role_keycloak_management.md
new file mode 100644
index 0000000000000000000000000000000000000000..153d5c312b3b30b8020097d6dd2a0346446c3e3c
--- /dev/null
+++ b/doc/role_keycloak_management.md
@@ -0,0 +1,11 @@
+# Role management in Keycloak
+
+Some initial configuration of Keycloak happens at Installation/Deployment time. Here are some notes regarding user management
+
+## Intended Audience: OpenSlice administrators
+
+There are cases that OpenSlice administrators need to configure Keycloak:
+
+* Change user roles, e.g. make a Simple user a Service Designer
+* Domain management
+* User Password reset
\ No newline at end of file
diff --git a/doc/terminology.md b/doc/terminology.md
index 204adb87c47fc391e6406b5a20ac6408928ee7f1..c021048c7d57bf77db58d6dee32b0a4f348f44f9 100644
--- a/doc/terminology.md
+++ b/doc/terminology.md
@@ -1,13 +1,17 @@
# User Roles
-User
-Service Designer
-OpenSlice administrator
+
+* User
+* Service Designer
+* OpenSlice administrator
# Terms
-OpenSlice management cluster
-Service Specification: Detailed descriptions of services, including attributes, configurations, performance metrics, and SLAs.
-Service Catalog
-Service Inventory
+* Resource Facing Service Specification (RFSSpec): A Service that exposes a resource Specification as a Service.
+* Customer Facing Service Specification (CFSSpec): Service exposed to users for Service Orders. Usually it exposes other CFSSpec(Service Bundle) or other RFSSpecs
+* OpenSlice management cluster
+* Service Specification: Detailed descriptions of services, including attributes, configurations, performance metrics, and SLAs.
+* Service Catalog
+* Service Categories
+* Service Inventory
diff --git a/mkdocs.yml b/mkdocs.yml
index aba5dfbf8cc2d56b40ddcd50e1fa9d52e068e44b..f84c12377043880298d1ec56a6f04960fa71cbf5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -79,6 +79,8 @@ nav:
- Introduction: deployment.md
- Docker Compose: deploymentCompose.md
- Kubernetes: deploymentK8s.md
+ - Portals:
+ - Introduction: portals_intro.md
- Configuration/Management:
- Introduction: config_intro.md
- Role/Keycloak management: role_keycloak_management.md
@@ -106,7 +108,7 @@ nav:
- Supported TMFORUM exposed APIs: ./naas/exposed_apis.md
- NFV support:
- Introduction: ./naas/nfv/intro.md
- - NFV Catalogs: ./naas/nfv/nfvcatalogs.md
+ - NFV Services: ./naas/nfv/nfvservices.md
- Service design:
- Introduction: ./service_design/intro.md
- Support for Kubernetes:
@@ -148,8 +150,6 @@ nav:
- APIs:
- TMF API: ./architecture/tmfapi.md
- NFV API: ./architecture/nfvapi.md
- - TMF WEB: ./architecture/tmfweb.md
- - NFV WEB: ./architecture/nfvweb.md
- Issue management: ./architecture/issuemgt.md
- Central logging: ./architecture/centrallog.md
- Contributing to OSL: