Vagrant, CI and Postman additions

.gitignore

@@ -1 +1,7 @@
-*.pyc
+*.pyc
+.vagrant/*
+.idea/*
+*,cover
+coverage.xml
+python/.coverage
+python/htmlcov 

.travis.yml

@@ -0,0 +1,29 @@
+language: python
+
+branches:
+  only:
+    - master
+    - hp-van
+
+python:
+  - "2.6"
+  - "2.7"
+
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y libxml2-dev python-libxml2
+  - wget ftp://xmlsoft.org/libxml2/python/libxml2-python-2.6.15.tar.gz
+  - tar -xzvf libxml2-python-2.6.15.tar.gz
+  - cd libxml2-python-2.6.15 && python setup.py install
+install:
+  - cd ..
+  - pip install -r python/requirements.txt
+  - pip install coveralls
+
+script:
+  - cd python
+  - coverage run --source=./ --omit=__init__.py,*Test.py,t/SciPass.py t/SciPassTest_mininet.py; coverage report -m; python -m coverage xml;coverage annotate; coverage html;
+
+after_success:
+  coveralls

Makefile

@@ -10,10 +10,13 @@ clean:
 	rm -rf dist
 
 test:
-	cd python; coverage run --source=./ --omit=__init__.py,*Test.py,t/SciPass.py t/Test.py; coverage report -m; coverage xml;coverage annotate; coverage html;
+	cd python; python -m coverage run --source=./ --omit=__init__.py,*Test.py,t/SciPass.py t/SciPassTest.py; python -m coverage report -m; python -m coverage xml;python -m coverage annotate; python -m coverage html;
+
+test_mininet:
+	cd python; python -m coverage run --source=./ --omit=__init__.py,*Test.py,t/SciPass.py t/SciPassTest_mininet.py; coverage report -m; python -m coverage xml;python -m coverage annotate; python -m coverage html;
 
 dist:
 	rm -rf dist/$(NAME)-$(VERSION)
 	mkdir -p dist/$(NAME)-$(VERSION)
 	cp -r etc/ python/ SciPass.spec dist/$(NAME)-$(VERSION)/
-	cd dist; tar -czvf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)/ --exclude .svn
+	cd dist; tar -czvf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)/ --exclude .svn

README.md

@@ -1,4 +1,53 @@
 SciPass
 =======
 
-SciPass is a SDN powered Science DMZ and IDS Load Balancer. 
+[![Travis Build status](https://travis-ci.org/chrissmall22/SciPass.svg?branch=master)](https://travis-ci.org/chrissmall22/SciPass)
+[![Coverage Status](https://img.shields.io/coveralls/chrissmall22/SciPass.svg)](https://coveralls.io/r/chrissmall22/SciPass?branch=master)
+
+SciPass is a SDN powered Science DMZ and IDS Load Balancer. 
+
+
+VM Environment with OpenDayLight
+=======
+
+The Vagrantfile provides a quick and easy way to spin up a VM containing all the code to run 
+SciPass and a Mininet based test environment to test functionality.
+
+
+
+To create the SciPass VM:
+
+First make sure Vagrant https://www.vagrantup.com/ is installed for your OS. You will need Vagrant 1.5 to use the Vagrant Cloud boxes. You should also have Hypervisor software installed. this has been tested agqinst VirtualBox but VMWare Workstation/Fusion should work as well.
+
+To create the VM with SciPass and ODL installed
+
+      vagrant up
+      vagrant ssh scipass
+
+To start the Ryu version of SciPass
+
+	  cd scipass/python	
+	  sudo mkdir /etc/SciPass
+	  sudo cp t/etc/SciPass-mininet.xml /etc/SciPass/SciPass.xml
+	  ryu-manager Ryu.py
+
+
+To create a Mininet network to match SciPass-mininet.xml
+
+	  cd mininet
+	  sudo mn --topo single,9 --mac --switch ovsk --controller remote
+
+Postman
+=======
+Install Postman for Chrome http://www.getpostman.com/
+
+Add repository at scipass/resources/postman/SciPass-API.json.postman_collection
+
+
+OpenDayLight
+===========
+
+To start up the OpenDaylight Controller
+
+      cd distribution-karaf-0.2.0-Helium
+      bin/karaf

Vagrantfile

@@ -0,0 +1,37 @@
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+
+
+# This uses Vagrant Cloud for simplicity so it needs to have Vagrant 1.5
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+
+  config.vm.provision "shell", path: "resources/puppet/scripts/bootstrap.sh"
+
+  config.vm.provision "puppet" do |puppet|
+      puppet.hiera_config_path = "resources/puppet/hiera.yaml"
+      puppet.working_directory = "/vagrant/resources/puppet"
+      puppet.manifests_path = "resources/puppet/manifests"
+      puppet.manifest_file  = "base.pp"
+  end
+
+  # Install single host with mininet and ODL 
+
+  config.vm.define "scipass" do |scipass|
+    scipass.vm.box = "ubuntu/trusty64"
+    scipass.vm.hostname = "scipass"
+    scipass.vm.network "private_network", ip: "192.168.50.70"
+    scipass.vm.provider :virtualbox do |vb|
+      vb.memory = 4096
+    end
+    scipass.vm.provider "vmware_fusion" do |vf|
+      vf.vmx["memsize"] = "4096"
+    end
+    scipass.vm.provision "puppet" do |puppet|
+      puppet.hiera_config_path = "resources/puppet/hiera.yaml"
+      puppet.working_directory = "/vagrant/resources/puppet"
+      puppet.manifests_path = "resources/puppet/manifests"
+      puppet.manifest_file  = "scipass.pp"
+    end
+  end
+end

python/.coveragerc

@@ -0,0 +1,2 @@
+[report]
+omit=*mock*,*libxml2*,*json*,*ipaddr*,*encodings*,*xmlrunner*,t/*.py

python/SciPass.py

@@ -67,7 +67,7 @@ def good_flow(self, obj):
       for name in self.config[datapath_id]:
         for port in self.config[datapath_id][name]['ports']['lan']:
             for prefix in port['prefixes']:
-              self.logger.error("Comparing" + str(new_prefix) + " " + str(prefix['prefix']))
+              #self.logger.error("Comparing" + str(new_prefix) + " " + str(prefix['prefix']))
               if(prefix['prefix'].Contains( new_prefix )):
                 in_port = port
                 dpid = datapath_id
@@ -701,7 +701,7 @@ def _setupSciDMZRules(self, dpid = None, domain_name = None):
     actions = []
     actions.append({"type": "output",
                     "port": int(ports['wan'][0]['port_id'])})
-    self.logger.error("FW WAN -> WAN: ")
+    #self.logger.error("FW WAN -> WAN: ")
     self.fireForwardingStateChangeHandlers( dpid         = dpid,
                                             domain       = domain_name,
                                             header       = header,
@@ -717,7 +717,7 @@ def _setupSciDMZRules(self, dpid = None, domain_name = None):
     actions = []
     actions.append({"type": "output",
                     "port": int(ports['fw_wan'][0]['port_id'])})
-    self.logger.error("WAN -> FW WAN")
+    #self.logger.error("WAN -> FW WAN")
     self.fireForwardingStateChangeHandlers( dpid         = dpid,
                                             domain       = domain_name,
                                             header       = header,
@@ -766,7 +766,7 @@ def _setupInlineIDS(self, dpid = None, domain_name = None):
     actions = []
     actions.append({"type": "output",
                     "port": int(ports['lan'][0]['port_id'])})
-    self.logger.error("FW WAN -> WAN: ")
+    #self.logger.error("FW WAN -> WAN: ")
     self.fireForwardingStateChangeHandlers( dpid         = dpid,
                                             domain       = domain_name,
                                             header       = header,

python/requirements.txt

@@ -0,0 +1,8 @@
+Routes>=1.12.3
+bottle>=0.10.6
+coverage>=3.7.1
+mock>=1.0.1
+ipaddr>=2.1.0
+xmlrunner>=1.7.7
+WebOb>=1.1.1
+