Restructuring VLAN tag net cfg, fixing ONOS-5613 and making newoptical activate automatically
- Moving VLAN tag assignment via net cfg to CarrierEthernetManager
- Modifying getVlanTag method to be used with a FC instead of a path
- S-TAG assigned to an FC via netcfg should:
* Not be used by another FC already (otherwise tag will not be registered in the first place)
* Be present in at least one of the LTPs (Cps) of the FC
* No other tag should be configured in another LTP (CP) of the FC
- Removing transportVlanTag netcfg
- Updating example port configuration JSON
- Fixing ONOS-5613 cast exception issue where InternalNetworkConfigListener was trying to get connect point from CONFIG_UNREGISTERED events
- Including onos.app.requires for the new optical app so that it’s activated automatically
- Adding/enhancing commands to configure packet-optical topology status and EVC fragmentation
- Adding more app info in pom.xml
Change-Id: Ief776ed6e6f687297a73759004660baf62bc7cb6
diff --git a/ecord/carrierethernet/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/ecord/carrierethernet/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index 117e7c1..3a35f08 100644
--- a/ecord/carrierethernet/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/ecord/carrierethernet/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -25,9 +25,6 @@
<ref component-id="carrierEthernetValidUniCompleter"/>
</completers>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetCreateFcCommand"/>
<completers>
@@ -37,63 +34,36 @@
<ref component-id="carrierEthernetValidLtpCompleter"/>
</completers>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetRemoveEvcCommand"/>
<completers>
<ref component-id="carrierEthernetEvcCompleter"/>
</completers>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetRemoveAllEvcsCommand"/>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetListEvcsCommand"/>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetListLtpsCommand"/>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetListUnisCommand"/>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetListFcsCommand"/>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetRemoveFcCommand"/>
<completers>
<ref component-id="carrierEthernetFcCompleter"/>
</completers>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetRemoveAllFcsCommand"/>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetCreateLtpCommand"/>
<completers>
@@ -101,45 +71,38 @@
<ref component-id="carrierEthernetPotentialLtpCompleter"/>
</completers>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetCreateUniCommand"/>
<completers>
<ref component-id="carrierEthernetPotentialUniCompleter"/>
</completers>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetRemoveLtpCommand"/>
<completers>
<ref component-id="carrierEthernetLtpCompleter"/>
</completers>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetRemoveUniCommand"/>
<completers>
<ref component-id="carrierEthernetUniCompleter"/>
</completers>
</command>
- </command-bundle>
-
- <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetPktOpticalTopoCommand"/>
<completers>
<ref component-id="carrierEthernetBooleanCompleter"/>
</completers>
</command>
+ <command>
+ <action class="org.onosproject.ecord.carrierethernet.cli.commands.CarrierEthernetEvcFragmentationCommand"/>
+ <completers>
+ <ref component-id="carrierEthernetBooleanCompleter"/>
+ </completers>
+ </command>
</command-bundle>
-
<bean id="placeholderCompleter" class="org.onosproject.cli.PlaceholderCompleter"/>
<bean id="carrierEthernetEvcTypeCompleter" class="org.onosproject.ecord.carrierethernet.cli.completers.CarrierEthernetEvcTypeCompleter"/>
<bean id="carrierEthernetEvcCompleter" class="org.onosproject.ecord.carrierethernet.cli.completers.CarrierEthernetEvcCompleter"/>
@@ -154,5 +117,4 @@
<bean id="carrierEthernetValidLtpCompleter" class="org.onosproject.ecord.carrierethernet.cli.completers.CarrierEthernetValidLtpCompleter"/>
<bean id="carrierEthernetBooleanCompleter" class="org.onosproject.ecord.carrierethernet.cli.completers.CarrierEthernetBooleanCompleter"/>
-
</blueprint>