Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9454568
Modifications qui seront validées :
Nov 28, 2022
0ab1c1d
nouveau fichier : bin/cloudnet/tosca/orchestrator.py
Nov 28, 2022
49998a1
Merge branch 'master' of https://github.com/JLCoulin/Cloudnet-TOSCA-t…
Nov 28, 2022
1e51f61
Merge branch 'Orange-OpenSource:master' into master
JLCoulin Feb 9, 2023
21fe612
Correction pour être en ligne avec Orange/cloudnet ....
JLCoulin Feb 9, 2023
3dacd8c
Ttry run unit test
JLCoulin Feb 9, 2023
f0c1cdf
Try unit test 2
JLCoulin Feb 9, 2023
251c992
try unit tests
JLCoulin Feb 9, 2023
47fd093
try unit tests
JLCoulin Feb 9, 2023
1268e08
try unit tests
JLCoulin Feb 9, 2023
06d7512
try unit tests
JLCoulin Feb 9, 2023
aaf16d4
new test
JLCoulin Feb 27, 2023
4bda4df
Run test from the test directory
JLCoulin Feb 27, 2023
70deffc
The directory tests is with an s
JLCoulin Feb 27, 2023
e576089
Préciser le chemin du run.sh
JLCoulin Feb 27, 2023
4aa145d
Change the way of launching bash script
JLCoulin Feb 27, 2023
c6d9953
Test launch command modified
JLCoulin Feb 27, 2023
c3eb949
Change the way multiple commands are executed
JLCoulin Feb 27, 2023
2b1c418
Call to build updated
JLCoulin Feb 27, 2023
5aa04ff
Call to the build script rewritted
JLCoulin Feb 27, 2023
ab54a93
Remove proxy in dokerfile
JLCoulin Feb 27, 2023
da4a894
Remove proxy in dockerfile
JLCoulin Feb 27, 2023
032bdc7
Comments related to proxies removed
JLCoulin Feb 27, 2023
ca2e626
Update .gitignore
JLCoulin Feb 27, 2023
3d11679
Rename unit-tests workflow
JLCoulin Mar 1, 2023
a21b4f1
Rename step for unit tests
JLCoulin Mar 1, 2023
9c87c3e
Add action example project & code status to readme
JLCoulin Mar 1, 2023
c27170c
Mardown cleanup
JLCoulin Mar 1, 2023
630daf9
Typo
JLCoulin Mar 1, 2023
6b3fcb8
Remove unwanted example
JLCoulin Mar 1, 2023
9981e88
Typo
JLCoulin Mar 1, 2023
6e5bf0f
Natural language typo
JLCoulin Mar 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: unit-tests
run-name: ${{ github.actor }} - unit tests
on: [push]
jobs:
unit-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- uses: docker-practice/actions-setup-docker@master
timeout-minutes: 12
- name: Unit tests
run: |
cd bin
bash ./build.sh
cd ../tests
pwd
bash ./run.sh
19 changes: 15 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# What is Cloudnet TOSCA toolbox?

Cloudnet TOSCA toolbox is an OASIS TOSCA processor for checking and adjusting TOSCA service templates.
TOSCA templates specify service structure and the procedure governing their life cycle. Services are typically application, infrastructure or network services.
TOSCA templates specify service structure and the procedure governing their lifecycle. Services are typically application, infrastructure or network services.
This set of tools is intended for syntax and type checking of any service templates written in TOSCA, including e.g. [NFV descriptors](https://forge.etsi.org/rep/nfv/SOL001).
It also allows for visualizing the associated architecture in different ways (UML, TOSCA, network diagrams). Have a look to [this video](https://www.youtube.com/watch?v=6yt-mqzbos4).
A web portal based on this code is available at this url: [https://toscatoolbox.orange.com](https://toscatoolbox.orange.com).
Expand All @@ -13,6 +13,8 @@ A web portal based on this code is available at this url: [https://toscatoolbox.
- [Network diagrams generation](#then-to-generate-network-diagrams-type)<br />
- [TOSCA diagrams generation](#to-get-tosca-diagrams-use-the-command)<br />
- [UML diagrams generation](#and-to-generate-uml-diagrams)<br />
- [Using TOSCA script from GitHub actions](#using-toscatoolbox-in-github-actions)<br />
- [Code status](#status)<br />

## Prerequisites

Expand Down Expand Up @@ -62,26 +64,35 @@ will :
- translate it into the MIT Alloy language,
- generate .dot, .nwdiag and .plantuml templates.

## Then to generate network diagrams, type:
## Then to generate network diagrams, type

```sh
generate_network_diagrams Results/NetworkDiagrams/*.nwdiag
```

![Network diagram example](/docs/pictures/OASIS-TOSCA-1.3_example-8.6.1_nw.png)

## To get TOSCA diagrams, use the command:
## To get TOSCA diagrams, use the command

```sh
generate_tosca_diagrams Results/ToscaDiagrams/*.dot
```

![TOSCA diagram example](/docs/pictures/OASIS-TOSCA-1.3_example-8.6.1_tosca.png)

## And to generate UML diagrams:
## And to generate UML diagrams

```sh
generate_uml2_diagrams Results/Uml2Diagrams/*.plantuml
```

![UML diagram example](/docs/pictures/OASIS-TOSCA-1.3_example-8.6.1_uml2.png)

## Using ToscaToolBox in GitHub actions

This GitHub project [actionTOSCAToolbox](https://github.com/JLCoulin/actionTOSCAToolbox) demonstrate how to launch a TSOSCA syntax checking from the actions.

## Status

[![unit-tests](https://github.com/JLCoulin/Cloudnet-TOSCA-toolbox/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/JLCoulin/Cloudnet-TOSCA-toolbox/actions/workflows/unit-tests.yml)
[![Lint Code Base](https://github.com/JLCoulin/Cloudnet-TOSCA-toolbox/actions/workflows/linter.yml/badge.svg)](https://github.com/JLCoulin/Cloudnet-TOSCA-toolbox/actions/workflows/linter.yml)
6 changes: 6 additions & 0 deletions examples/OpenStack/tosca2cloudnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,36 @@
Alloy:
# Target directory where Alloy files are generated.
target-directory: RESULTS/Alloy
generation: true

# Configuration of the declarative workflow generator.
DeclarativeWorkflows:
# Target directory where declarative workflows are generated.
target-directory: RESULTS/DeclarativeWorkflows
generation: false

# Configuration of the network diagram generator.
nwdiag:
# Target directory where network diagrams are generated.
target-directory: RESULTS/NetworkDiagrams
generation: true

# Configuration of the TOSCA diagram generator.
tosca_diagrams:
# Target directory where network diagrams are generated.
target-directory: RESULTS/ToscaDiagrams
generation: true

# Configuration of the UML2 diagram generator.
UML2:
# Target directory where UML2 diagrams are generated.
target-directory: RESULTS/Uml2Diagrams
generation: true

HOT:
# Target directory where HOT templates are generated.
target-directory: RESULTS/HOT
generation: true

# Logging configuration.
logging:
Expand Down