prefix odlif; revision-date 2015-03-31;
}
+ import opendaylight-inventory {
+ prefix inv; revision-date 2013-08-19;
+ }
+
+ import ietf-interfaces {
+ prefix if; revision-date 2014-05-08;
+ }
+
import opendaylight-action-types {prefix action;}
import opendaylight-flow-types {prefix offlow;revision-date "2013-10-26";}
}
}
- rpc get-interface-from-port {
- description "used to retrieve interface from port details";
- input {
- leaf interface-type {
- description "Type of the interface (vlan/gre or vxlan tunnel)";
- type identityref {
- base odlif:tunnel-type-base;
- }
- }
- leaf dpid {
- type uint64;
- }
- leaf portno {
- type uint32;
- }
- leaf interface-id {
- description "Used to provide the interface specific differentiator information (vlanId/gre-key/vxlan-vni)";
- type uint64;
- }
- }
- output {
- leaf interface-name {
- type string;
- }
- }
- }
-
rpc get-egress-actions-for-interface {
description "used to retrieve group actions to use from interface name";
input {
}
}
}
+
+ rpc get-interface-type {
+ description "to get the type of the interface(vlan/vxlan or gre)";
+ input {
+ leaf intf-name {
+ type string;
+ }
+ }
+ output {
+ leaf interface-type {
+ type identityref {
+ base if:interface-type;
+ }
+ }
+ }
+ }
+
+ rpc get-nodeconnector-id-from-interface {
+ description "to get nodeconnector id associated with an interface";
+ input {
+ leaf intf-name {
+ type string;
+ }
+ }
+ output {
+ leaf nodeconnector-id {
+ type inv:node-connector-id;
+ }
+ }
+ }
}
\ No newline at end of file
createBridgeEntryIfNotPresent(dpId, dataBroker, t);
- BridgeRefEntryKey BridgeRefEntryKey = new BridgeRefEntryKey(dpId);
- InstanceIdentifier<BridgeRefEntry> dpnBridgeEntryIid =
- InterfaceMetaUtils.getBridgeRefEntryIdentifier(BridgeRefEntryKey);
- BridgeRefEntry bridgeRefEntry =
- InterfaceMetaUtils.getBridgeRefEntryFromOperDS(dpnBridgeEntryIid, dataBroker);
BridgeEntryKey bridgeEntryKey = new BridgeEntryKey(dpId);
BridgeInterfaceEntryKey bridgeInterfaceEntryKey = new BridgeInterfaceEntryKey(interfaceNew.getName());
interfaceNew.getName(), t);
futures.add(t.submit());
- InstanceIdentifier<OvsdbBridgeAugmentation> bridgeIid =
- (InstanceIdentifier<OvsdbBridgeAugmentation>)bridgeRefEntry.getBridgeReference().getValue();
- Optional<OvsdbBridgeAugmentation> bridgeNodeOptional =
- IfmUtil.read(LogicalDatastoreType.OPERATIONAL, bridgeIid, dataBroker);
- if (bridgeNodeOptional.isPresent()) {
- OvsdbBridgeAugmentation ovsdbBridgeAugmentation = bridgeNodeOptional.get();
- String bridgeName = ovsdbBridgeAugmentation.getBridgeName().getValue();
- SouthboundUtils.addPortToBridge(bridgeIid, interfaceNew,
- ovsdbBridgeAugmentation, bridgeName, interfaceNew.getName(), dataBroker, futures);
+ // create bridge on switch, if switch is connected
+ BridgeRefEntryKey BridgeRefEntryKey = new BridgeRefEntryKey(dpId);
+ InstanceIdentifier<BridgeRefEntry> dpnBridgeEntryIid =
+ InterfaceMetaUtils.getBridgeRefEntryIdentifier(BridgeRefEntryKey);
+ BridgeRefEntry bridgeRefEntry =
+ InterfaceMetaUtils.getBridgeRefEntryFromOperDS(dpnBridgeEntryIid, dataBroker);
+ if(bridgeRefEntry != null && bridgeRefEntry.getBridgeReference() != null) {
+ LOG.debug("creating bridge interface on dpn {}", bridgeEntryKey);
+ InstanceIdentifier<OvsdbBridgeAugmentation> bridgeIid =
+ (InstanceIdentifier<OvsdbBridgeAugmentation>) bridgeRefEntry.getBridgeReference().getValue();
+ Optional<OvsdbBridgeAugmentation> bridgeNodeOptional =
+ IfmUtil.read(LogicalDatastoreType.OPERATIONAL, bridgeIid, dataBroker);
+ if (bridgeNodeOptional.isPresent()) {
+ OvsdbBridgeAugmentation ovsdbBridgeAugmentation = bridgeNodeOptional.get();
+ String bridgeName = ovsdbBridgeAugmentation.getBridgeName().getValue();
+ SouthboundUtils.addPortToBridge(bridgeIid, interfaceNew,
+ ovsdbBridgeAugmentation, bridgeName, interfaceNew.getName(), dataBroker, futures);
+ }
}
}
return Futures.immediateFuture(rpcResultBuilder.build());
}
+ @Override
+ public Future<RpcResult<GetInterfaceTypeOutput>> getInterfaceType(GetInterfaceTypeInput input) {
+ String interfaceName = input.getIntfName();
+ RpcResultBuilder<GetInterfaceTypeOutput> rpcResultBuilder;
+ try {
+ InterfaceKey interfaceKey = new InterfaceKey(interfaceName);
+ Interface interfaceInfo = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(interfaceKey, dataBroker);
+
+ GetInterfaceTypeOutputBuilder output = new GetInterfaceTypeOutputBuilder().setInterfaceType(interfaceInfo.getType());
+ rpcResultBuilder = RpcResultBuilder.success();
+ rpcResultBuilder.withResult(output.build());
+ } catch (Exception e) {
+ LOG.error("Retrieval of interface type for the key {} failed due to {}", interfaceName, e);
+ rpcResultBuilder = RpcResultBuilder.failed();
+ }
+ return Futures.immediateFuture(rpcResultBuilder.build());
+ }
+
@Override
public Future<RpcResult<GetEgressActionsForInterfaceOutput>> getEgressActionsForInterface(GetEgressActionsForInterfaceInput input) {
RpcResultBuilder<GetEgressActionsForInterfaceOutput> rpcResultBuilder;
return Futures.immediateFuture(rpcResultBuilder.build());
}
- public static InstanceIdentifier<InterfaceChildEntry> getInterfaceChildEntryIdentifier(InterfaceParentEntryKey parentEntryKey, InterfaceChildEntryKey interfaceChildEntryKey) {
- InstanceIdentifier.InstanceIdentifierBuilder<InterfaceChildEntry> interfaceChildEntryInstanceIdentifierBuilder =
- InstanceIdentifier.builder(InterfaceChildInfo.class).child(InterfaceParentEntry.class, parentEntryKey).child(InterfaceChildEntry.class, interfaceChildEntryKey);
- return interfaceChildEntryInstanceIdentifierBuilder.build();
- }
-
- public static InterfaceChildEntry getInterfaceChildEntryFromConfigDS(String interfaceName,
- DataBroker dataBroker) {
- InterfaceParentEntryKey parentEntryKey = new InterfaceParentEntryKey(interfaceName);
- InterfaceChildEntryKey childEntryKey = new InterfaceChildEntryKey(interfaceName);
- InstanceIdentifier<InterfaceChildEntry> interfaceChildEntryInstanceIdentifier = getInterfaceChildEntryIdentifier(parentEntryKey, childEntryKey);
- Optional<InterfaceChildEntry> interfaceChildEntryOptional =
- IfmUtil.read(LogicalDatastoreType.CONFIGURATION, interfaceChildEntryInstanceIdentifier, dataBroker);
- if (!interfaceChildEntryOptional.isPresent()) {
- return null;
- }
- return interfaceChildEntryOptional.get();
- }
-
@Override
public Future<RpcResult<GetPortFromInterfaceOutput>> getPortFromInterface(GetPortFromInterfaceInput input) {
RpcResultBuilder<GetPortFromInterfaceOutput> rpcResultBuilder;
}
@Override
- public Future<RpcResult<GetInterfaceFromPortOutput>> getInterfaceFromPort(GetInterfaceFromPortInput input) {
- /*RpcResultBuilder<GetInterfaceFromPortOutput> rpcResultBuilder;
+ public Future<RpcResult<GetNodeconnectorIdFromInterfaceOutput>> getNodeconnectorIdFromInterface(GetNodeconnectorIdFromInterfaceInput input) {
+ String interfaceName = input.getIntfName();
+ RpcResultBuilder<GetNodeconnectorIdFromInterfaceOutput> rpcResultBuilder;
try {
- Interface interfaceInfo = null;
- NodeId nodeId = IfmUtil.buildDpnNodeId(input.getDpid());
- Node node = getNodeFromInventoryOperDS(nodeId, dataBroker);
- ChildInterfaceNames childInterfaceNames = node.getAugmentation(ChildInterfaceNames.class);
- for(OfInterfaceRefInfo ofInterfaceRefInfo : childInterfaceNames.getOfInterfaceRefInfo()){
- interfaceInfo = getInterfaceFromTunnelKey(ofInterfaceRefInfo.getOfIntfName(), input.getInterfaceId(),
- input.getInterfaceType());
- }
- GetInterfaceFromPortOutputBuilder output = new GetInterfaceFromPortOutputBuilder().
- setInterfaceName(interfaceInfo == null ? null : interfaceInfo.getName());
+ org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState =
+ InterfaceManagerCommonUtils.getInterfaceStateFromOperDS(interfaceName, dataBroker);
+ String lowerLayerIf = ifState.getLowerLayerIf().get(0);
+ NodeConnectorId nodeConnectorId = new NodeConnectorId(lowerLayerIf);
+
+ GetNodeconnectorIdFromInterfaceOutputBuilder output = new GetNodeconnectorIdFromInterfaceOutputBuilder().setNodeconnectorId(nodeConnectorId);
rpcResultBuilder = RpcResultBuilder.success();
rpcResultBuilder.withResult(output.build());
- }catch(Exception e){
- LOG.error("Retrieval of interface for the key {} failed due to {}" ,input.getPortno(), e);
+ } catch (Exception e) {
+ LOG.error("Retrieval of nodeconnector id for the key {} failed due to {}", interfaceName, e);
rpcResultBuilder = RpcResultBuilder.failed();
}
return Futures.immediateFuture(rpcResultBuilder.build());
- */
- return null;
}
public List<ActionInfo> getEgressActionInfosForInterface(String interfaceName) {
return null;
}
- public static Node getNodeFromInventoryOperDS(NodeId nodeId, DataBroker dataBroker) {
- InstanceIdentifier<Node> nodeIdentifier = InstanceIdentifier.builder(Nodes.class)
- .child(Node.class, new NodeKey(nodeId)).build();
-
- Optional<Node> nodeOptional = IfmUtil.read(LogicalDatastoreType.OPERATIONAL,
- nodeIdentifier, dataBroker);
- if (!nodeOptional.isPresent()) {
- return null;
- }
- return nodeOptional.get();
- }
-
- public Interface getInterfaceFromTunnelKey(String interfaceName, BigInteger tunnelKey,
- Class<? extends TunnelTypeBase> ifType){
-
- /*Interface interfaceInfo = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(new InterfaceKey(interfaceName), dataBroker);
-
- if(ifType.isAssignableFrom(IfL2vlan.class)){
- IfL2vlan vlanIface = interfaceInfo.getAugmentation(IfL2vlan.class);
- LOG.trace("L2Vlan: {}",vlanIface);
- long vlanVid = (vlanIface == null) ? 0 : vlanIface.getVlanId();
- if(tunnelKey.intValue() == vlanVid){
- return interfaceInfo;
- }
- }else if(ifType.isAssignableFrom(TunnelTypeBase.class)){
- IfTunnel ifTunnel = interfaceInfo.getAugmentation(IfTunnel.class);
- TunnelResources tunnelResources = ifTunnel.getTunnelResources();
- if(ifType.isAssignableFrom(TunnelTypeGre.class)) {
- IfGre ifGre = tunnelResources.getAugmentation(IfGre.class);
- if (ifGre.getGreKey() == tunnelKey) {
- return interfaceInfo;
- }
- }else if(ifType.isAssignableFrom(TunnelTypeVxlan.class)){
- IfVxlan ifVxlan = tunnelResources.getAugmentation(IfVxlan.class);
- if(ifVxlan.getVni() == tunnelKey){
- return interfaceInfo;
- }
- }
- }
- return null;*/
- return null;
- }
}
\ No newline at end of file
Code Review / vpnservice.git / commitdiff