Revision: 16093
Author: [email protected]
Date: Tue Dec 28 22:54:43 2010
Log: Added Layer4 API
http://code.google.com/p/mobicents/source/detail?r=16093
Added:
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Layer4.java
Modified:
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Link.java
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Linkset.java
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetManager.java
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetStream.java
=======================================
--- /dev/null
+++
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Layer4.java
Tue Dec 28 22:54:43 2010
@@ -0,0 +1,9 @@
+package org.mobicents.ss7.linkset.oam;
+
+public interface Layer4 {
+
+ public void add(Linkset linkset);
+
+ public void remove(Linkset linkset);
+
+}
=======================================
---
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Link.java
Tue Dec 28 07:05:04 2010
+++
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Link.java
Tue Dec 28 22:54:43 2010
@@ -40,7 +40,7 @@
protected abstract void init() throws Exception;
- public String getLinkName() {
+ public String getName() {
return linkName;
}
=======================================
---
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Linkset.java
Tue Dec 28 07:05:04 2010
+++
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/Linkset.java
Tue Dec 28 22:54:43 2010
@@ -83,7 +83,7 @@
this.ni = ni;
}
- public String getLinksetName() {
+ public String getName() {
return linksetName;
}
@@ -148,7 +148,7 @@
for (int i = 0; i < linksCount; i++) {
Link link = xml.get(LINK);
link.setLinkSet(linkSet);
- linkSet.links.put(link.getLinkName(), link);
+ linkSet.links.put(link.getName(), link);
}
}
=======================================
---
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetManager.java
Tue Dec 28 00:58:14 2010
+++
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetManager.java
Tue Dec 28 22:54:43 2010
@@ -43,6 +43,8 @@
private FastMap<String, Linkset> linksets = new FastMap<String,
Linkset>();
private LinksetFactoryFactory linksetFactoryFactory = null;
+
+ private Layer4 layer4 = null;
public LinksetManager() {
binding.setAlias(Linkset.class, LINKSET);
@@ -70,6 +72,14 @@
public void setPersistDir(String persistDir) {
this.persistDir = persistDir;
}
+
+ public Layer4 getLayer4() {
+ return layer4;
+ }
+
+ public void setLayer4(Layer4 layer4) {
+ this.layer4 = layer4;
+ }
public void start() {
this.persistFile.clear();
@@ -94,6 +104,8 @@
"Failed to load the SS7 configuration file. \n%s", e
.getMessage()));
}
+
+ logger.info("Started LinksetManager");
}
public void stop() {
@@ -129,13 +141,16 @@
}
// TODO huh, we parse first and then check for name :(
- if (this.linksets.containsKey(linkset.getLinksetName())) {
+ if (this.linksets.containsKey(linkset.getName())) {
return LinkOAMMessages.LINKSET_ALREADY_EXIST;
}
- this.linksets.put(linkset.getLinksetName(), linkset);
+ this.linksets.put(linkset.getName(), linkset);
this.store();
-
+
+ if(this.layer4 != null){
+ this.layer4.add(linkset);
+ }
return LinkOAMMessages.LINKSET_SUCCESSFULLY_ADDED;
}
@@ -166,6 +181,10 @@
this.store();
+ if(this.layer4 != null){
+ this.layer4.add(linkset);
+ }
+
return LinkOAMMessages.LINKSET_SUCCESSFULLY_REMOVED;
}
@@ -419,7 +438,7 @@
// Exception
while (reader.hasNext()) {
Linkset linkset = reader.read(LINKSET);
- this.linksets.put(linkset.getLinksetName(), linkset);
+ this.linksets.put(linkset.getName(), linkset);
}
} catch (XMLStreamException ex) {
// this.logger.info(
=======================================
---
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetStream.java
Tue Dec 28 07:05:04 2010
+++
/trunk/protocols/ss7/management/linkset/src/main/java/org/mobicents/ss7/linkset/oam/LinksetStream.java
Tue Dec 28 22:54:43 2010
@@ -14,5 +14,11 @@
* @return
*/
public abstract boolean poll(int operation, int timeout);
+
+ /**
+ * Get the name of the Stream.
+ * @return
+ */
+ public abstract String getName();
}