Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Merge branch 'feature/reduce-integration-test-dependencies' of https://github.com/gbehrmann/opennaas into develop
Interfaces are duplicated in networkModel
http://jira.i2cat.net:8080/browse/OPENNAAS-184
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into feature/opennaas-184
Revert functionality

Remove the physical interfaces and create an ethernet interface for each
logical interface and an extra tagged ethernet for each VLAN endpoint.
Created velocity templates to add/remove tagged ethernet encapsulation and set vlan-ids

Tagged ethernet encapsulation is set in junos config in a different way deppendeing on the interface type.
This encapsulation is allowed only in physical eth interfaces and in logical lt interfaces.
- In physical eth interfaces, a <vlan-tagging> tag is used
- In logical lt interfaces, an <encapsulation> element with "vlan" value is used. It has to be noticed that
this <encapsulation> element is the same used to specify plain ethernet encapsulation (using "ethernet" value).

VlanId can be set only in logical interfaces.
A <vlan-id> element with desired vlanId value is used.
Created actions to set/remove tagged ethernet encapsulation, and set vlan-id.
Added commands to add/remove tagged ethernet encapsulation and set vlan-id.
Add the layers to the interfaces in the export command.

It solve the problem that we had interfaces duplicated.
http://jira.i2cat.net:8080/browse/OPENNAAS-184
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into feature/opennaas-184

Conflicts:
	core/opennaas-core-resources/src/main/java/org/opennaas/core/resources/descriptor/network/Device.java
	core/opennaas-core-resources/src/main/java/org/opennaas/core/resources/descriptor/network/Interface.java
	core/opennaas-core-resources/src/main/java/org/opennaas/core/resources/descriptor/network/InterfaceId.java
	core/opennaas-core-resources/src/main/java/org/opennaas/core/resources/descriptor/network/NetworkTopology.java
	extensions/bundles/net.i2cat.mantychore.model/src/main/java/net/i2cat/mantychore/model/mappers/Cim2NdlMapper.java
	extensions/bundles/net.i2cat.mantychore.model/src/test/java/net/i2cat/mantychore/model/tests/Cim2NdlMapperTest.java
	extensions/bundles/net.i2cat.mantychore.network.capability.basic/src/main/java/net/i2cat/mantychore/network/capability/basic/shell/AddResourceToNetworkCommand.java
	extensions/bundles/net.i2cat.mantychore.network.model/src/main/java/net/i2cat/mantychore/network/model/layer/Layer.java
	extensions/bundles/net.i2cat.mantychore.network.model/src/main/java/net/i2cat/mantychore/network/model/technology/ethernet/EthernetLayer.java
	extensions/bundles/net.i2cat.mantychore.network.model/src/main/java/net/i2cat/mantychore/network/model/technology/ethernet/TaggedEthernetLayer.java
	extensions/bundles/net.i2cat.mantychore.network.model/src/main/java/net/i2cat/mantychore/network/model/technology/ip/IPLayer.java
	extensions/bundles/net.i2cat.mantychore.network.model/src/main/java/net/i2cat/mantychore/network/model/topology/Link.java
	extensions/bundles/net.i2cat.mantychore.network.repository/src/main/java/net/i2cat/mantychore/network/repository/NetworkMapperModelToDescriptor.java
Fixes in taggedEthernetEncapsulation templates.

- Close an unclosed "if" tag.
- Do not set encapsulation type in setVlanIdInLT template.

Templates have been also copied to velocity templates bundle.
Merge problems with develop solved.
Replace typed encapsulation commands for generic setEncapsulation and setEncapsulationlabel ones.

A new approach for managing encapsulation is taken.
Now there are only two commands to manage encapsulation.
- SetEncapsulationCommand, whitch sets the type of encapsulation used in an interface.
- SetEncapsulationLabelCommand, whitch sets the label for current encapsulation type in given interface.

Currently, there are two supported types for setEncapsulationCommand:
- None: use no encapsulation.
- Tagged-ethernet: Use tagged ethernet encapsulation.

With no encapsulation, set label fails.
With tagged-ethernet, set label launches setVlanId with provided label, hence, label is checked to be a valid vlan-id [0..4096)

A temporary hack has been introduced in ChassisCapability to launch appropiated typed set encapsulation action.
This hack should be removed when ChassisCapability gets it's own interface.
Resolve problems when the interface haven't layer.
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas
Added checks to setEncapsulation actions.

Note: Checking an interface exists in the router is not yet possible.
Right now, we only can check interface exists in the candidate, but that's not what we want:

An interface is removed from the configuration when it has nothing configured.
That is a typical case when setting encapsulation, as interface may have no encapsulation nor units.
Unless this interface contains further configuration (description, or whatever else) it will not appear in candidate.

For this reason, setEncapsulation actions do not check an interface exists or not,
 and when executed, they create such interface in the configuration.
Update tests for passing with new checkings.

Some tests have been disabled, because mock does not filter the configuration.
Merge branch 'develop' of git://github.com/dana-i2cat/opennaas into develop