diff --git a/public/develop/service_design/catalogs/index.html b/public/develop/service_design/catalogs/index.html
index dd5c2e5b616f22bb774eef8c3c0c59be2692f86e..f7c7734c144441415ca64e8c3180a7dbb5c53bfe 100644
--- a/public/develop/service_design/catalogs/index.html
+++ b/public/develop/service_design/catalogs/index.html
@@ -2955,7 +2955,7 @@
<h1 id="catalogs-and-templates">Catalogs and Templates</h1>
-<p>The OpenSlice Service Catalogue (accessible through the API or Services portal) contains the representation of Service Specifications, either created from the provider defining service attributes, or by supporting the GSMA Generic Slice Templates (GST) as well as the VINNI Service Blueprint. The following scenarios are supported by the OpenSlice Service Catalogue.</p>
+<p>The OpenSlice Service Catalogue (accessible through the API or Services portal) contains the representation of Service Specifications, either created from the provider defining service attributes, or by supporting the GSMA Generic Slice Template (GST). The following scenarios are supported by the OpenSlice Service Catalogue.</p>
<h2 id="createdesign-a-service-specification">Create/Design a Service Specification</h2>
<h3 id="createdesign-a-customer-facing-service-specification-cfss">Create/Design a Customer Facing Service Specification (CFSS)</h3>
<p>Customer Facing Service Specification are the services offered to customers. You can create a new Service Specification from the menu. The services created through the UI are Customer Facing Services Specifications (CFSSs). </p>
@@ -3017,8 +3017,13 @@ On October 16th 2019 GSMA published NG.116 Version 2.0 which defines the Generi
<h2 id="consume-and-expose-service-specifications-from-other-service-catalogues">Consume and expose Service Specifications from other Service Catalogues</h2>
<p>See more on <a href="../../getting_started/configuration/consuming_services_from_external_partners/">Consuming Services From External Partner Organizations</a>.</p>
<h2 id="probe-further">Probe further</h2>
-<p><a href="../kubernetes/exposing_kubernetes_resources/">Design Kubernetes-based Service Specifications</a></p>
-<p><a href="../nfv/design_nfv_services/">Design NFV/OSM-based Service Specifications</a></p>
+<p>Design and expose services based on:</p>
+<ul>
+<li><a href="../kubernetes/exposing_kubernetes_resources/">Containerized resources via the Kubernetes Operator pattern</a></li>
+<li><a href="../nfv/design_nfv_services/">NFV artifacts</a></li>
+<li><a href="../monitoring/design_monitoring_services/">Monitoring sources</a></li>
+<li><a href="../generic/design_generic_services/">Generic, developer-owned controllers</a></li>
+</ul>
diff --git a/public/develop/service_design/intro/index.html b/public/develop/service_design/intro/index.html
index aa3f01c232f1c9114c69793af44a721992a80955..4eea4014f8acaa118baaca8a181c771cefbe47de 100644
--- a/public/develop/service_design/intro/index.html
+++ b/public/develop/service_design/intro/index.html
@@ -1422,19 +1422,6 @@
- <label class="md-nav__link md-nav__link--active" for="__toc">
-
-
-
- <span class="md-ellipsis">
- Introduction
-
- </span>
-
-
- <span class="md-nav__icon md-icon"></span>
- </label>
-
<a href="./" class="md-nav__link md-nav__link--active">
@@ -1447,34 +1434,6 @@
</a>
-
-
-<nav class="md-nav md-nav--secondary" aria-label="Table of contents">
-
-
-
-
-
-
- <label class="md-nav__title" for="__toc">
- <span class="md-nav__icon md-icon"></span>
- Table of contents
- </label>
- <ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
-
- <li class="md-nav__item">
- <a href="#probe-further" class="md-nav__link">
- <span class="md-ellipsis">
- Probe further
- </span>
- </a>
-
-</li>
-
- </ul>
-
-</nav>
-
</li>
@@ -2767,23 +2726,6 @@
- <label class="md-nav__title" for="__toc">
- <span class="md-nav__icon md-icon"></span>
- Table of contents
- </label>
- <ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
-
- <li class="md-nav__item">
- <a href="#probe-further" class="md-nav__link">
- <span class="md-ellipsis">
- Probe further
- </span>
- </a>
-
-</li>
-
- </ul>
-
</nav>
</div>
</div>
@@ -2800,14 +2742,9 @@
<h1 id="service-design-in-openslice">Service Design in OpenSlice</h1>
<p><strong>Intended Audience: OpenSlice Service Designers</strong></p>
-<p>This section offers details on how to design Service Specifications and expose them in Service Catalogs</p>
-<p>Service Designers create detailed service specifications, which are then managed and exposed in service catalogs. These services are integrated into OpenSlice E2E service orchestration framework to automate and optimize the delivery of network services.</p>
-<p>OpenSlice can be used to design service specifications for various services, even not networking related services. Here we cover how service designers can expose services related to the NFV world and the containerized world.</p>
-<h2 id="probe-further">Probe further</h2>
-<ul>
-<li><a href="../kubernetes/exposing_kubernetes_resources/">Design and expose services based on containerized resources via the Kubernetes Operator pattern</a></li>
-<li><a href="../nfv/design_nfv_services/">Design and expose services based on NFV artifacts</a></li>
-</ul>
+<p>This section offers details on how to design Service Specifications and expose them in Service Catalogs.</p>
+<p>Service Designers create detailed Service Specifications, which are then managed and exposed in Service Catalogs. These services are integrated into OpenSlice end-to-end service orchestration framework to automate and optimize the delivery of network services.</p>
+<p>OpenSlice can be used to design Service Specifications for various services, even not networking related ones. Here we cover how Service Designers can expose services, related to the cloud world (containerized/Kubernetes and NFV), monitoring domain, or even generic developer-owned ones.</p>
diff --git a/public/develop/service_ordering/images/service_marketplace.png b/public/develop/service_ordering/images/service_marketplace.png
new file mode 100644
index 0000000000000000000000000000000000000000..c590119c86f899b157021b666411c3b1aabb3459
Binary files /dev/null and b/public/develop/service_ordering/images/service_marketplace.png differ
diff --git a/public/develop/service_ordering/images/service_order_checkout.png b/public/develop/service_ordering/images/service_order_checkout.png
new file mode 100644
index 0000000000000000000000000000000000000000..744dc9fe561d6b9076ff6eb2c7bc1a5672a86913
Binary files /dev/null and b/public/develop/service_ordering/images/service_order_checkout.png differ
diff --git a/public/develop/service_ordering/images/service_order_preview.png b/public/develop/service_ordering/images/service_order_preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..300c4c224d4296263117cbbb4eed353794a07f1c
Binary files /dev/null and b/public/develop/service_ordering/images/service_order_preview.png differ
diff --git a/public/develop/service_ordering/images/service_order_preview_completed.png b/public/develop/service_ordering/images/service_order_preview_completed.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c94363959f48f50c58f876dc858c4be4fa446b9
Binary files /dev/null and b/public/develop/service_ordering/images/service_order_preview_completed.png differ
diff --git a/public/develop/service_ordering/images/service_preview.png b/public/develop/service_ordering/images/service_preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e1fd9426f476517eac8f6a4feef45ecc3f65401
Binary files /dev/null and b/public/develop/service_ordering/images/service_preview.png differ
diff --git a/public/develop/service_ordering/ordering_services/index.html b/public/develop/service_ordering/ordering_services/index.html
index a1a8983a0b05efc7fe8a172d947b98a81cdcd5a6..9632da0d8dbcae44cc6490629ede30ecd06a133e 100644
--- a/public/develop/service_ordering/ordering_services/index.html
+++ b/public/develop/service_ordering/ordering_services/index.html
@@ -2065,6 +2065,19 @@
+ <label class="md-nav__link md-nav__link--active" for="__toc">
+
+
+
+ <span class="md-ellipsis">
+ Ordering Services from catalogs
+
+ </span>
+
+
+ <span class="md-nav__icon md-icon"></span>
+ </label>
+
<a href="./" class="md-nav__link md-nav__link--active">
@@ -2077,6 +2090,52 @@
</a>
+
+
+<nav class="md-nav md-nav--secondary" aria-label="Table of contents">
+
+
+
+
+
+
+ <label class="md-nav__title" for="__toc">
+ <span class="md-nav__icon md-icon"></span>
+ Table of contents
+ </label>
+ <ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
+
+ <li class="md-nav__item">
+ <a href="#service-marketplace" class="md-nav__link">
+ <span class="md-ellipsis">
+ Service Marketplace
+ </span>
+ </a>
+
+</li>
+
+ <li class="md-nav__item">
+ <a href="#service-order-checkout" class="md-nav__link">
+ <span class="md-ellipsis">
+ Service Order Checkout
+ </span>
+ </a>
+
+</li>
+
+ <li class="md-nav__item">
+ <a href="#service-order-preview" class="md-nav__link">
+ <span class="md-ellipsis">
+ Service Order Preview
+ </span>
+ </a>
+
+</li>
+
+ </ul>
+
+</nav>
+
</li>
@@ -2726,6 +2785,41 @@
+ <label class="md-nav__title" for="__toc">
+ <span class="md-nav__icon md-icon"></span>
+ Table of contents
+ </label>
+ <ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
+
+ <li class="md-nav__item">
+ <a href="#service-marketplace" class="md-nav__link">
+ <span class="md-ellipsis">
+ Service Marketplace
+ </span>
+ </a>
+
+</li>
+
+ <li class="md-nav__item">
+ <a href="#service-order-checkout" class="md-nav__link">
+ <span class="md-ellipsis">
+ Service Order Checkout
+ </span>
+ </a>
+
+</li>
+
+ <li class="md-nav__item">
+ <a href="#service-order-preview" class="md-nav__link">
+ <span class="md-ellipsis">
+ Service Order Preview
+ </span>
+ </a>
+
+</li>
+
+ </ul>
+
</nav>
</div>
</div>
@@ -2742,7 +2836,26 @@
<h1 id="service-ordering">Service Ordering</h1>
<p><strong>Intended Audience: OpenSlice Users</strong></p>
-<p><em>This section is WIP.</em></p>
+<p>Having covered how OpenSlice can facilitate the Service Design and exposure, this section introduces the process of ordering the designed Service Specifications and their fulfillment process.</p>
+<p>To that extend, we assume that the OpenSlice Service Designers have already created the designated, detailed Service Specifications that are willing to expose to the OpenSlice users, or to potential Communication Service Customers (CSCs). Furthermore, the designed Service Specifications are categorized in the respective Service Categories and Catalogs.</p>
+<h2 id="service-marketplace">Service Marketplace</h2>
+<p>The OpenSlice User can browse the Services Marketplace for available services. There is a designated Service Catalog Explorer that goes through all the available Catalogs and the respective Categories, as seen in the following figure.</p>
+<p><a class="glightbox" href="../images/service_marketplace.png" data-type="image" data-width="100%" data-height="auto" data-desc-position="bottom"><img alt="Service Marketplace" src="../images/service_marketplace.png" /></a></p>
+<p>The User can filter offered services within a Category, and when needed, preview a desired service for more information, as well as configurable/non-configurable characteristics.</p>
+<p><a class="glightbox" href="../images/service_preview.png" data-type="image" data-width="100%" data-height="auto" data-desc-position="bottom"><img alt="Service Preview" src="../images/service_preview.png" /></a></p>
+<p>Once satisfied, the User may place the selected service(s) in the Order List. An icon at the top-right part of the navbar presents the number of services in the Order List. Clicking that icon, the flow is navigated to the Service Order Checkout page.</p>
+<h2 id="service-order-checkout">Service Order Checkout</h2>
+<p>Here, the User can see the Order List in detail and configure each Order Item. Specifically, all the configurable characteristics (if any) of a service can be altered and customized, as well as some general preferences, i.e. notes and Service Order duration.</p>
+<blockquote>
+<p>The ultimate duration may differ from the one requested by the User, as it has to be approved by an Administrator.</p>
+</blockquote>
+<p><a class="glightbox" href="../images/service_order_checkout.png" data-type="image" data-width="100%" data-height="auto" data-desc-position="bottom"><img alt="Service Order Checkout" src="../images/service_order_checkout.png" /></a></p>
+<h2 id="service-order-preview">Service Order Preview</h2>
+<p>When the User clicks the Order Service button from the previous step, a Service Order is created and saved in the respective database. A User can browse its issued Service Order(s) by the "My Service Orders" tab. A freshly issued Service Order acquires the state of <em>INITIAL</em>. By selecting a Service Order, the User navigates to the Service Order Overview and Management page. Here, once again, the User may change the requested duration, add notes towards the Administrator, or edit the respective Order Items (change the user-defined characteristics).</p>
+<p><a class="glightbox" href="../images/service_order_preview.png" data-type="image" data-width="100%" data-height="auto" data-desc-position="bottom"><img alt="Service Order Overview" src="../images/service_order_preview.png" /></a></p>
+<p>Once the Service Order is reviewed by an Administrator, the state is expected to switch to <em>ACKNOWLEDGED</em>, which signals that the order is ready to be processed by the orchestrator. When this happens, the state will switch once more to <em>IN PROGRESS</em> and eventually to <em>COMPLETED</em>, once the order is successfully fulfilled. At this stage, the User can browse each Order Item and navigate to the created service instances in the Service Inventory. Each service contains relevant information about its execution and deployment and can also be edited.</p>
+<p><a class="glightbox" href="../images/service_order_preview_completed.png" data-type="image" data-width="100%" data-height="auto" data-desc-position="bottom"><img alt="Service Order Overview - Completed" src="../images/service_order_preview_completed.png" /></a></p>
+<p>The User can edit the created Services or opt to terminate the Service Order earlier than the requested duration, by selecting the Order Item and click on the termination icon.</p>