diff --git a/plugins/eu.netide.configuration.generator/src/eu/netide/configuration/generator/vagrantfile/VagrantfileGenerateAction.xtend b/plugins/eu.netide.configuration.generator/src/eu/netide/configuration/generator/vagrantfile/VagrantfileGenerateAction.xtend index 5a8951c..7dc253b 100644 --- a/plugins/eu.netide.configuration.generator/src/eu/netide/configuration/generator/vagrantfile/VagrantfileGenerateAction.xtend +++ b/plugins/eu.netide.configuration.generator/src/eu/netide/configuration/generator/vagrantfile/VagrantfileGenerateAction.xtend @@ -2,8 +2,6 @@ package eu.netide.configuration.generator.vagrantfile import eu.netide.configuration.utils.fsa.FSAProvider import org.eclipse.core.resources.IResource -import org.eclipse.emf.common.util.URI -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl /** * Sets up the necessary tools to generate a Vagrantfile diff --git a/plugins/eu.netide.configuration.generator/src/eu/netide/configuration/generator/vagrantfile/VagrantfileGenerator.xtend b/plugins/eu.netide.configuration.generator/src/eu/netide/configuration/generator/vagrantfile/VagrantfileGenerator.xtend index 739fda3..f87b7f8 100644 --- a/plugins/eu.netide.configuration.generator/src/eu/netide/configuration/generator/vagrantfile/VagrantfileGenerator.xtend +++ b/plugins/eu.netide.configuration.generator/src/eu/netide/configuration/generator/vagrantfile/VagrantfileGenerator.xtend @@ -59,6 +59,9 @@ class VagrantfileGenerator { url = bundle.getEntry("scripts/install_tools.sh") var toolscriptpath = scriptpath(url) + url = bundle.getEntry("scripts/install_onos.sh") + var onosscriptpath = scriptpath(url) + // var controllerPlatformKeys = input.allContents.filter(typeof(Controller)).map [ c | // String.format("controller_platform_%s", c.name) // ] @@ -108,6 +111,7 @@ class VagrantfileGenerator { config.vm.provision "shell", path: "«odlscriptpath»", privileged: false config.vm.provision "shell", path: "«flscriptpath»", privileged: false config.vm.provision "shell", path: "«toolscriptpath»", privileged: false + config.vm.provision "shell", path: "«onosscriptpath»", privileged: false «ENDIF» # Syncing the mininet configuration folder with the vm diff --git a/plugins/eu.netide.configuration.launcher/scripts/install_odl.sh b/plugins/eu.netide.configuration.launcher/scripts/install_odl.sh index a6d4bbe..5cddec7 100644 --- a/plugins/eu.netide.configuration.launcher/scripts/install_odl.sh +++ b/plugins/eu.netide.configuration.launcher/scripts/install_odl.sh @@ -1,6 +1,6 @@ #!/bin/bash cd -if [ ! -d ~/netide/openflowplugin ]; then +if [ ! -d ~/netide/distribution-karaf-0.4.0-Beryllium ]; then cd netide diff --git a/plugins/eu.netide.configuration.launcher/scripts/install_onos.sh b/plugins/eu.netide.configuration.launcher/scripts/install_onos.sh new file mode 100644 index 0000000..e5e183b --- /dev/null +++ b/plugins/eu.netide.configuration.launcher/scripts/install_onos.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +if [ ! -d ~/netide/onos ]; then + + if [ ! -d ~/netide/Engine ]; then + cd ~/netide + git clone https://github.com/fp7-netide/Engine.git + else + echo "Engine seems to be already installed. Skipping..." + fi + + cd ~/netide/ + git clone https://gerrit.onosproject.org/onos + sleep 5 + git clone https://gerrit.onosproject.org/onos + cd onos + git checkout onos-1.4 + mvn clean install + + cd ~/netide/Engine/onos-shim + mvn clean install + +sh -c 'echo "# NetIDE cell + +# the address of the VM to install the package onto +export OC1=\"192.168.56.101\" + +# the default address used by ONOS utilities when none are supplied +export OCI=\"192.168.56.101\" + +# the ONOS apps to load at startup +export ONOS_APPS=\"drivers,openflow,proxyarp,mobility\" + +# the Mininet VM (if you have one) +#export OCN=\"192.168.56.102\" + +# pattern to specify which address to use for inter-ONOS node communication (not used with single-instance core) +export ONOS_NIC=\"192.168.56.*\" + +export ONOS_USER=karaf +export ONOS_GROUP=karaf +export ONOS_WEB_USER=karaf +export ONOS_WEB_PASS=karaf" > ~/netide/onos/tools/test/cells/netide' + +else + echo "ONOS already installed. Skipping..." +fi diff --git a/plugins/eu.netide.configuration.launcher/src/eu/netide/configuration/launcher/managers/SshManager.xtend b/plugins/eu.netide.configuration.launcher/src/eu/netide/configuration/launcher/managers/SshManager.xtend index de1e2ea..c09d049 100644 --- a/plugins/eu.netide.configuration.launcher/src/eu/netide/configuration/launcher/managers/SshManager.xtend +++ b/plugins/eu.netide.configuration.launcher/src/eu/netide/configuration/launcher/managers/SshManager.xtend @@ -197,7 +197,8 @@ class SshManager implements IManager { "scripts/install_pox.sh", "scripts/install_odl.sh", "scripts/install_logger_debugger.sh", - "scripts/install_floodlight.sh" + "scripts/install_floodlight.sh", + "scripts/install_onos.sh" ) val fullScripts = newArrayList() diff --git a/plugins/eu.netide.configuration.launcher/src/eu/netide/configuration/launcher/starters/impl/DebuggerStarter.xtend b/plugins/eu.netide.configuration.launcher/src/eu/netide/configuration/launcher/starters/impl/DebuggerStarter.xtend index ec02484..ba1963c 100644 --- a/plugins/eu.netide.configuration.launcher/src/eu/netide/configuration/launcher/starters/impl/DebuggerStarter.xtend +++ b/plugins/eu.netide.configuration.launcher/src/eu/netide/configuration/launcher/starters/impl/DebuggerStarter.xtend @@ -19,7 +19,7 @@ class DebuggerStarter extends Starter { } override getCommandLine() { - String.format("python ~/netide/Tools/debugger/Core/debugger.py -o ~/netide/debug_results") + String.format("bash -c \'cd ~/netide/Tools/debugger/Core/ && python ./debugger.py -o ~/netide/debug_results\'") } } \ No newline at end of file diff --git a/plugins/eu.netide.sysreq/src/eu/netide/SysReq.xtext b/plugins/eu.netide.sysreq/src/eu/netide/SysReq.xtext index bb523b8..065cd02 100644 --- a/plugins/eu.netide.sysreq/src/eu/netide/SysReq.xtext +++ b/plugins/eu.netide.sysreq/src/eu/netide/SysReq.xtext @@ -24,6 +24,7 @@ Controller: '{' 'name' ':' name=STRING ',' ('version' ':' version=STRING ',')? + ('port' ':' port=STRING ',')? ('entrypoint' ':' entrypoint=STRING ',')? ('features' ':' '[' features+=STRING (',' features+=STRING)* ']' ',')? '}' diff --git a/releng/eu.netide.dependencies/pom.xml b/releng/eu.netide.dependencies/pom.xml index ab35e24..18f2537 100644 --- a/releng/eu.netide.dependencies/pom.xml +++ b/releng/eu.netide.dependencies/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 eu.netide.dependencies