Skip to content

Commit

Permalink
Merge branch 'Dublin'
Browse files Browse the repository at this point in the history
  • Loading branch information
DanieleBringhenti committed Jul 4, 2024
2 parents 70b2873 + 40e7bff commit 3f31773
Show file tree
Hide file tree
Showing 52 changed files with 715 additions and 54 deletions.
17 changes: 17 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<classpathentry excluding="**" kind="src" output="target/classes" path="resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/junit/org.hamcrest.core_1.3.0.v201303031735.jar"/>
Expand Down Expand Up @@ -89,5 +90,21 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
4 changes: 2 additions & 2 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
</natures>
<filteredResources>
<filter>
<id>1607762605873</id>
<id>1715250205417</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
Expand Down
14 changes: 14 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

Copyright 2017-2024 Politecnico di Torino and others.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
122 changes: 97 additions & 25 deletions README.md

Large diffs are not rendered by default.

Empty file modified WebContent/META-INF/MANIFEST.MF
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/cdi-api-1.1.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/com.microsoft.z3.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/el-api-2.2.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/javax.inject-1.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/javax.json-1.1.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/javax.json-api-1.1.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/javax.json.bind-api-1.0.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/javax.servlet-api-3.0.1.jar
100644 → 100755
Empty file.
Empty file.
Empty file modified WebContent/WEB-INF/lib/jersey-hk2.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/jersey-media-json-binding.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/jersey-media-sse-2.25.1.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/jni/Microsoft.Z3.xml
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/jni/debian64.tar.gz
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/jni/ubuntu32.tar.gz
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/jni/ubuntu64.tar.gz
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/jsr250-api-1.0.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/org.osgi.core-4.2.0.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/osgi-resource-locator-1.0.1.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/persistence-api-1.0.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/slf4j-api-1.7.25.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/validation-api-1.1.0.Final.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/lib/yasson-1.0.jar
100644 → 100755
Empty file.
Empty file modified WebContent/WEB-INF/web.xml
100644 → 100755
Empty file.
Empty file modified WebContent/_swagger-ui/favicon-16x16.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified WebContent/_swagger-ui/favicon-32x32.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified WebContent/_swagger-ui/index.html
100644 → 100755
Empty file.
Empty file modified WebContent/_swagger-ui/oauth2-redirect.html
100644 → 100755
Empty file.
Empty file modified WebContent/_swagger-ui/swagger-ui-bundle.js
100644 → 100755
Empty file.
Empty file modified WebContent/_swagger-ui/swagger-ui-bundle.js.map
100644 → 100755
Empty file.
Empty file modified WebContent/_swagger-ui/swagger-ui-standalone-preset.js
100644 → 100755
Empty file.
Empty file modified WebContent/_swagger-ui/swagger-ui-standalone-preset.js.map
100644 → 100755
Empty file.
Empty file modified WebContent/_swagger-ui/swagger-ui.css
100644 → 100755
Empty file.
Empty file modified WebContent/_swagger-ui/swagger-ui.css.map
100644 → 100755
Empty file.
Empty file modified WebContent/_swagger-ui/swagger-ui.js
100644 → 100755
Empty file.
Empty file modified WebContent/_swagger-ui/swagger-ui.js.map
100644 → 100755
Empty file.
Empty file modified WebContent/index.html
100644 → 100755
Empty file.
8 changes: 7 additions & 1 deletion gen-src/META-INF/sun-jaxb.episode
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0
See <a href="https://javaee.github.io/jaxb-v2/">https://javaee.github.io/jaxb-v2/</a>
Any modifications to this file will be lost upon recompilation of the source schema.
Generated on: 2022.01.28 at 08:19:58 PM CET
Generated on: 2024.06.10 at 05:45:07 PM CEST
-->

Expand Down Expand Up @@ -252,6 +252,12 @@ Generated on: 2022.01.28 at 08:19:58 PM CET

</jaxb:bindings>

<jaxb:bindings if-exists="true" scd="InitialProperty">

<jaxb:class ref="it.polito.verefoo.jaxb.InitialProperty"/>

</jaxb:bindings>

<jaxb:bindings if-exists="true" scd="Hosts">

<jaxb:class ref="it.polito.verefoo.jaxb.Hosts"/>
Expand Down
1 change: 1 addition & 0 deletions resources/api-docs.json

Large diffs are not rendered by default.

258 changes: 258 additions & 0 deletions resources/demo_files/demo_input.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,258 @@
<?xml version="1.0" encoding="UTF-8"?>
<NFV xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../xsd/nfvSchema.xsd">
<graphs>
<graph id="0">
<!-- End points (Web servers ) -->
<node functional_type="WEBSERVER" name="130.10.0.1"> <!-- web server 1 -->
<neighbour name="1.0.0.1" />
<configuration description="e1" name="httpserver1">
<webserver>
<name>130.10.0.1</name>
</webserver>
</configuration>
</node>

<node functional_type="WEBSERVER" name="130.10.0.2"> <!-- web server 2 -->
<neighbour name="1.0.0.2" />
<configuration description="e2" name="httpserver2">
<webserver>
<name>130.10.0.2</name>
</webserver>
</configuration>
</node>

<node functional_type="WEBSERVER" name="130.10.0.3"> <!-- web server 3 -->
<neighbour name="1.0.0.3" />
<configuration description="e3" name="httpserver3">
<webserver>
<name>130.10.0.3</name>
</webserver>
</configuration>
</node>

<node name="1.0.0.1"> <!-- a13 -->
<neighbour name="130.10.0.1" />
<neighbour name="130.10.0.4" />
</node>

<node name="1.0.0.2"> <!-- a14 -->
<neighbour name="130.10.0.2" />
<neighbour name="130.10.0.4" />
</node>

<node name="1.0.0.3"> <!-- a15 -->
<neighbour name="130.10.0.3" />
<neighbour name="130.10.0.4" />
</node>

<node functional_type="LOADBALANCER" name="130.10.0.4">
<neighbour name="1.0.0.1" />
<neighbour name="1.0.0.2" />
<neighbour name="1.0.0.3" />
<neighbour name="1.0.0.4" />
<configuration description="s9" name="loadbalancer">
<loadbalancer>
<pool>130.10.0.1</pool>
<pool>130.10.0.2</pool>
<pool>130.10.0.3</pool>
</loadbalancer>
</configuration>
</node>

<node name="1.0.0.4"> <!-- a16 -->
<neighbour name="130.10.0.4" />
<neighbour name="33.33.33.2" />
</node>

<node functional_type="FORWARDER" name="33.33.33.2"> <!-- Cache -->
<neighbour name="1.0.0.4" />
<neighbour name="1.0.0.5" />
<neighbour name="1.0.0.6" />
<neighbour name="1.0.0.7" />
<configuration name="ForwardConf">
<forwarder>
<name>Forwarder</name>
</forwarder>
</configuration>
</node>

<node name="1.0.0.5"> <!-- a17 -->
<neighbour name="33.33.33.2" />
<neighbour name="40.40.41.-1" />
</node>

<node name="1.0.0.6"> <!-- a18 -->
<neighbour name="33.33.33.2" />
<neighbour name="40.40.42.-1" />
</node>

<node functional_type="WEBCLIENT" name="40.40.41.-1"> <!-- e4 endpoint network -->
<neighbour name="1.0.0.5" />
<configuration description="e4" name="officeA">
<webclient nameWebServer="130.10.0.1" />
</configuration>
</node>

<node functional_type="WEBCLIENT" name="40.40.42.-1"> <!-- e5 endpoint network -->
<neighbour name="1.0.0.6" />
<configuration description="e5" name="businessofficeA">
<webclient nameWebServer="130.10.0.1" />
</configuration>
</node>

<node name="1.0.0.7"> <!-- a19 -->
<neighbour name="33.33.33.2" />
<neighbour name="33.33.33.3" />
</node>

<node functional_type="FORWARDER" name="33.33.33.3"> <!-- Traffic monitor -->
<neighbour name="1.0.0.7" />
<neighbour name="1.0.0.8" />
<neighbour name="1.0.0.9" />
<configuration name="ForwardConf">
<forwarder>
<name>Forwarder</name>
</forwarder>
</configuration>
</node>

<node name="1.0.0.8"> <!-- a20 -->
<neighbour name="33.33.33.3" />
<neighbour name="88.80.84.-1" />
</node>

<node functional_type="WEBCLIENT" name="88.80.84.-1"> <!-- e6 endpoint network -->
<neighbour name="1.0.0.8" />
<configuration description="e6" name="companyB">
<webclient nameWebServer="130.10.0.1" />
</configuration>
</node>

<node name="1.0.0.9"> <!-- a21 -->
<neighbour name="33.33.33.3" />
<neighbour name="220.124.30.1" />
</node>

<node functional_type="NAT" name="220.124.30.1">
<neighbour name="1.0.0.9" />
<neighbour name="1.0.0.10" />
<neighbour name="1.0.0.11" />
<configuration description="s12" name="nat">
<nat>
<source>192.168.3.-1</source> <!-- e7 -->
<source>192.168.2.-1</source> <!-- e8 -->
</nat>
</configuration>
</node>


<node name="1.0.0.10"> <!-- a22 -->
<neighbour name="220.124.30.1" />
<neighbour name="192.168.3.-1" />
</node>

<node name="1.0.0.11"> <!-- a23 -->
<neighbour name="220.124.30.1" />
<neighbour name="192.168.2.-1" />
</node>

<node functional_type="WEBCLIENT" name="192.168.3.-1"> <!-- e7 endpoint network -->
<neighbour name="1.0.0.10" />
<configuration description="e7" name="officeC">
<webclient nameWebServer="130.10.0.1" />
</configuration>
</node>

<node functional_type="WEBCLIENT" name="192.168.2.-1"> <!-- e8 endpoint network -->
<neighbour name="1.0.0.11" />
<configuration description="e8" name="businessofficeC">
<webclient nameWebServer="130.10.0.1" />
</configuration>
</node>



</graph>
</graphs>
<Constraints>
<NodeConstraints/>
<LinkConstraints />
</Constraints>
<PropertyDefinition>
<!-- policy 1 -->
<Property graph="0" name="ReachabilityProperty" src="192.168.3.-1" dst="192.168.2.-1" />
<!-- policy 2 -->
<Property graph="0" name="ReachabilityProperty" src="192.168.2.-1" dst="192.168.3.-1" />
<!-- policy 3 -->
<Property graph="0" name="ReachabilityProperty" src="192.168.3.-1" dst="130.10.0.1" dst_port="80" lv4proto="TCP"/>
<Property graph="0" name="ReachabilityProperty" src="192.168.3.-1" dst="130.10.0.2" dst_port="80" lv4proto="TCP"/>
<Property graph="0" name="ReachabilityProperty" src="192.168.3.-1" dst="130.10.0.3" dst_port="80" lv4proto="TCP"/>
<Property graph="0" name="ReachabilityProperty" src="192.168.3.-1" dst="130.10.0.4" dst_port="80" lv4proto="TCP"/>
<!-- policy 4 -->
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.1" dst_port="0-79" lv4proto="TCP" /> <!-- deny traffic != 80 -->
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.1" dst_port="81-65535" lv4proto="TCP"/>
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.2" dst_port="0-79" lv4proto="TCP" /> <!-- deny traffic != 80 -->
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.2" dst_port="81-65535" lv4proto="TCP"/>
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.3" dst_port="0-79" lv4proto="TCP" /> <!-- deny traffic != 80 -->
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.3" dst_port="81-65535" lv4proto="TCP"/>
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.4" dst_port="0-79" lv4proto="TCP" /> <!-- deny traffic != 80 -->
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.4" dst_port="81-65535" lv4proto="TCP"/>
<!-- policy 5 -->
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.1" lv4proto="UDP" />
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.2" lv4proto="UDP" />
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.3" lv4proto="UDP" />
<Property graph="0" name="IsolationProperty" src="192.168.3.-1" dst="130.10.0.4" lv4proto="UDP" />
<!-- policy 6 -->
<Property graph="0" name="IsolationProperty" src="192.168.2.-1" dst="130.10.0.1" />
<Property graph="0" name="IsolationProperty" src="192.168.2.-1" dst="130.10.0.2" />
<Property graph="0" name="IsolationProperty" src="192.168.2.-1" dst="130.10.0.3" />
<Property graph="0" name="IsolationProperty" src="192.168.2.-1" dst="130.10.0.4" />
<!-- policy 7 -->
<Property graph="0" name="ReachabilityProperty" src="130.10.0.1" dst="192.168.3.-1" />
<Property graph="0" name="ReachabilityProperty" src="130.10.0.2" dst="192.168.3.-1" />
<Property graph="0" name="ReachabilityProperty" src="130.10.0.3" dst="192.168.3.-1" />
<Property graph="0" name="ReachabilityProperty" src="130.10.0.4" dst="192.168.3.-1" />
<!-- policy 8 -->
<Property graph="0" name="ReachabilityProperty" src="40.40.41.-1" dst="130.10.0.1" dst_port="80" lv4proto="TCP"/>
<Property graph="0" name="ReachabilityProperty" src="40.40.41.-1" dst="130.10.0.2" dst_port="80" lv4proto="TCP"/>
<Property graph="0" name="ReachabilityProperty" src="40.40.41.-1" dst="130.10.0.3" dst_port="80" lv4proto="TCP"/>
<Property graph="0" name="ReachabilityProperty" src="40.40.41.-1" dst="130.10.0.4" dst_port="80" lv4proto="TCP"/>
<!-- policy 9 -->
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.1" dst_port="0-79" lv4proto="TCP" /> <!-- deny traffic != 80 -->
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.1" dst_port="81-65535" lv4proto="TCP"/>
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.2" dst_port="0-79" lv4proto="TCP" /> <!-- deny traffic != 80 -->
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.2" dst_port="81-65535" lv4proto="TCP"/>
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.3" dst_port="0-79" lv4proto="TCP" /> <!-- deny traffic != 80 -->
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.3" dst_port="81-65535" lv4proto="TCP"/>
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.4" dst_port="0-79" lv4proto="TCP" /> <!-- deny traffic != 80 -->
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.4" dst_port="81-65535" lv4proto="TCP"/>
<!-- policy 10 -->
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.1" lv4proto="UDP" />
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.2" lv4proto="UDP" />
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.3" lv4proto="UDP" />
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="130.10.0.4" lv4proto="UDP" />
<!-- policy 11 -->
<Property graph="0" name="IsolationProperty" src="40.40.42.-1" dst="130.10.0.1" />
<Property graph="0" name="IsolationProperty" src="40.40.42.-1" dst="130.10.0.2" />
<Property graph="0" name="IsolationProperty" src="40.40.42.-1" dst="130.10.0.3" />
<Property graph="0" name="IsolationProperty" src="40.40.42.-1" dst="130.10.0.4" />
<!-- policy 12 -->
<Property graph="0" name="ReachabilityProperty" src="130.10.0.1" dst="40.40.41.-1" />
<Property graph="0" name="ReachabilityProperty" src="130.10.0.2" dst="40.40.41.-1" />
<Property graph="0" name="ReachabilityProperty" src="130.10.0.3" dst="40.40.41.-1" />
<Property graph="0" name="ReachabilityProperty" src="130.10.0.4" dst="40.40.41.-1" />
<!-- policy 13 -->
<Property graph="0" name="ReachabilityProperty" src="40.40.42.-1" dst="40.40.41.-1" />
<Property graph="0" name="IsolationProperty" src="40.40.41.-1" dst="40.40.42.-1" />
<!-- policy 14 -->
<Property graph="0" name="ReachabilityProperty" src="88.80.84.-1" dst="40.40.41.-1" />
<Property graph="0" name="ReachabilityProperty" src="88.80.84.-1" dst="40.40.42.-1" />
<!-- policy 15 -->
<Property graph="0" name="IsolationProperty" src="88.80.84.-1" dst="130.10.0.1" />
<Property graph="0" name="IsolationProperty" src="88.80.84.-1" dst="130.10.0.2" />
<Property graph="0" name="IsolationProperty" src="88.80.84.-1" dst="130.10.0.3" />
<Property graph="0" name="IsolationProperty" src="88.80.84.-1" dst="130.10.0.4" />

</PropertyDefinition>
</NFV>
Loading

0 comments on commit 3f31773

Please sign in to comment.