Skip to content

Commit

Permalink
Merge branch 'space/14.1-enlinkd' of github.com:OpenNMS/opennms into …
Browse files Browse the repository at this point in the history 
…space/14.1-enlinkd
  • Loading branch information
@thedesloge
thedesloge committed May 21, 2014
2 parents 0a556e4 + 0680c9f commit 1d5af42
Show file tree
Hide file tree
Showing 52 changed files with 4,206 additions and 1,731 deletions.
187 changes: 121 additions & 66 deletions core/schema/src/main/liquibase/1.13.1/changelog.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,57 @@

</changeSet>

<changeSet author="rssntn67" id="1.13.1-ipnettomedia">
<preConditions onFail="MARK_RAN">
<not><tableExists tableName="ipnettomedia" /></not>
</preConditions>

<createTable tableName="ipnettomedia">
<column name="id" type="integer">
<constraints primaryKey="true" nullable="false" />
</column>
<column name="netaddress" type="text" >
<constraints nullable="false" />
</column>
<column name="physaddress" type="varchar(32)">
<constraints nullable="false" />
</column>
<column name="sourcenodeid" type="integer" >
<constraints nullable="false" />
</column>
<column name="sourceifindex" type="integer" >
<constraints nullable="false" />
</column>
<column name="createtime" type="DATETIME">
<constraints nullable="false" />
</column>
<column name="lastpolltime" type="DATETIME">
<constraints nullable="false" />
</column>
</createTable>

<ext:addAutoIncrement tableName="ipnettomedia" columnName="id" sequenceName="opennmsNxtId" />

<addForeignKeyConstraint constraintName="fk_nodeid91" onDelete="CASCADE"
baseTableName="ipnettomedia" baseColumnNames="sourcenodeid"
referencedTableName="node" referencedColumnNames="nodeid" />

<createIndex tableName="ipnettomedia" indexName="ipnettomedia_nodeid_idx">
<column name="nodeid" />
</createIndex>
<createIndex tableName="ipnettomedia" indexName="ipnettomedia_lastpoll_idx">
<column name="lastpolltime" />
</createIndex>
<createIndex tableName="ipnettomedia" indexName="ipnettomedia_pk_idx">
<column name="netaddress" />
<column name="physaddress" />
</createIndex>

<rollback>
<dropTable tableName="ipnettomedia" />
</rollback>
</changeSet>

<changeSet author="rssntn67" id="1.13.1-bridgeelement">
<preConditions onFail="MARK_RAN">
<not><tableExists tableName="bridgeelement" /></not>
Expand Down Expand Up @@ -521,154 +572,158 @@
</rollback>
</changeSet>

<changeSet author="rssntn67" id="1.13.1-bridgebridgelink">

<changeSet author="rssntn67" id="1.13.1-bridgestplink">
<preConditions onFail="MARK_RAN">
<not><tableExists tableName="bridgebridgelink" /></not>
<not><tableExists tableName="bridgestplink" /></not>
</preConditions>

<createTable tableName="bridgebridgelink">
<createTable tableName="bridgestplink">
<column name="id" type="integer">
<constraints primaryKey="true" nullable="false" />
</column>
<column name="nodeid" type="integer" >
<constraints nullable="false" />
</column>
<column name="bridgeport" type="integer" >
<column name="stpport" type="integer" >
<constraints nullable="false" />
</column>
<column name="bridgeportifindex" type="integer" >
<column name="stpportpriority" type="integer" >
<constraints nullable="false" />
</column>
<column name="stpportstate" type="integer" >
<constraints nullable="false" />
</column>
<column name="stpportenable" type="integer" >
<constraints nullable="false" />
</column>
<column name="stpportpathcost" type="integer" >
<constraints nullable="false" />
</column>
<column name="stpportifindex" type="integer" >
<constraints nullable="true" />
</column>
<column name="bridgeportifname" type="varchar(32)">
<column name="stpportifname" type="varchar(32)">
<constraints nullable="true" />
</column>
<column name="vlan" type="integer" >
<constraints nullable="true" />
</column>
<column name="designatednodeid" type="integer" >
<column name="designatedroot" type="varchar(16)">
<constraints nullable="false" />
</column>
<column name="designatedbridgeport" type="integer" >
<column name="designatedcost" type="integer" >
<constraints nullable="false" />
</column>
<column name="designatedbridgeportifindex" type="integer" >
<constraints nullable="true" />
</column>
<column name="designatedbridgeportifname" type="varchar(32)">
<constraints nullable="true" />
<column name="designatedbridge" type="varchar(16)">
<constraints nullable="false" />
</column>
<column name="designatedvlan" type="integer" >
<constraints nullable="true" />
<column name="designatedport" type="varchar(4)">
<constraints nullable="false" />
</column>
<column name="bridgebridgelinkcreatetime" type="DATETIME">
<column name="bridgestplinkcreatetime" type="DATETIME">
<constraints nullable="false" />
</column>
<column name="bridgebridgelinklastpolltime" type="DATETIME">
<column name="bridgestplinklastpolltime" type="DATETIME">
<constraints nullable="false" />
</column>
</createTable>

<ext:addAutoIncrement tableName="bridgebridgelink" columnName="id" sequenceName="opennmsNxtId" />

<addForeignKeyConstraint constraintName="fk_nodeid83" onDelete="CASCADE"
baseTableName="bridgebridgelink" baseColumnNames="nodeid"
referencedTableName="node" referencedColumnNames="nodeid" />
<ext:addAutoIncrement tableName="bridgestplink" columnName="id" sequenceName="opennmsNxtId" />

<addForeignKeyConstraint constraintName="fk_nodeid84" onDelete="CASCADE"
baseTableName="bridgebridgelink" baseColumnNames="designatednodeid"
<addForeignKeyConstraint constraintName="fk_nodeid85" onDelete="CASCADE"
baseTableName="bridgestplink" baseColumnNames="nodeid"
referencedTableName="node" referencedColumnNames="nodeid" />

<createIndex tableName="bridgebridgelink" indexName="bridgebridgelink_nodeid_idx">
<createIndex tableName="bridgestplink" indexName="bridgestplink_nodeid_idx">
<column name="nodeid" />
</createIndex>
<createIndex tableName="bridgebridgelink" indexName="bridgebridgelink_lastpoll_idx">
<column name="bridgebridgelinklastpolltime" />
<createIndex tableName="bridgestplink" indexName="bridgestplink_lastpoll_idx">
<column name="bridgestplinklastpolltime" />
</createIndex>
<createIndex tableName="bridgebridgelink" indexName="bridgebridgelink_pk_idx">
<createIndex tableName="bridgestplink" indexName="bridgestplink_pk_idx1">
<column name="nodeid" />
<column name="bridgeport" />
<column name="stpport" />
</createIndex>
<createIndex tableName="bridgestplink" indexName="bridgestplink_pk_idx2">
<column name="designatedbridge" />
</createIndex>

<rollback>
<dropTable tableName="bridgebridgelink" />
<dropTable tableName="bridgestplink" />
</rollback>
</changeSet>

<changeSet author="rssntn67" id="1.13.1-bridgestplink">
<changeSet author="rssntn67" id="1.13.1-bridgebridgelink">
<preConditions onFail="MARK_RAN">
<not><tableExists tableName="bridgestplink" /></not>
<not><tableExists tableName="bridgebridgelink" /></not>
</preConditions>

<createTable tableName="bridgestplink">
<createTable tableName="bridgebridgelink">
<column name="id" type="integer">
<constraints primaryKey="true" nullable="false" />
</column>
<column name="nodeid" type="integer" >
<constraints nullable="false" />
</column>
<column name="stpport" type="integer" >
<constraints nullable="false" />
</column>
<column name="stpportpriority" type="integer" >
<constraints nullable="false" />
</column>
<column name="stpportstate" type="integer" >
<constraints nullable="false" />
</column>
<column name="stpportenable" type="integer" >
<column name="bridgeport" type="integer" >
<constraints nullable="false" />
</column>
<column name="stpportifindex" type="integer" >
<column name="bridgeportifindex" type="integer" >
<constraints nullable="true" />
</column>
<column name="stpportifname" type="varchar(32)">
<column name="bridgeportifname" type="varchar(32)">
<constraints nullable="true" />
</column>
<column name="vlan" type="integer" >
<constraints nullable="true" />
</column>
<column name="designatedroot" type="varchar(16)">
<column name="designatednodeid" type="integer" >
<constraints nullable="false" />
</column>
<column name="designatedcost" type="integer" >
<column name="designatedbridgeport" type="integer" >
<constraints nullable="false" />
</column>
<column name="designatedbridge" type="varchar(16)">
<constraints nullable="false" />
<column name="designatedbridgeportifindex" type="integer" >
<constraints nullable="true" />
</column>
<column name="designatedport" type="varchar(4)">
<constraints nullable="false" />
<column name="designatedbridgeportifname" type="varchar(32)">
<constraints nullable="true" />
</column>
<column name="bridgestplinkcreatetime" type="DATETIME">
<column name="designatedvlan" type="integer" >
<constraints nullable="true" />
</column>
<column name="bridgebridgelinkcreatetime" type="DATETIME">
<constraints nullable="false" />
</column>
<column name="bridgestplinklastpolltime" type="DATETIME">
<column name="bridgebridgelinklastpolltime" type="DATETIME">
<constraints nullable="false" />
</column>
</createTable>

<ext:addAutoIncrement tableName="bridgestplink" columnName="id" sequenceName="opennmsNxtId" />
<ext:addAutoIncrement tableName="bridgebridgelink" columnName="id" sequenceName="opennmsNxtId" />

<addForeignKeyConstraint constraintName="fk_nodeid85" onDelete="CASCADE"
baseTableName="bridgestplink" baseColumnNames="nodeid"
<addForeignKeyConstraint constraintName="fk_nodeid83" onDelete="CASCADE"
baseTableName="bridgebridgelink" baseColumnNames="nodeid"
referencedTableName="node" referencedColumnNames="nodeid" />

<createIndex tableName="bridgestplink" indexName="bridgestplink_nodeid_idx">
<addForeignKeyConstraint constraintName="fk_nodeid84" onDelete="CASCADE"
baseTableName="bridgebridgelink" baseColumnNames="designatednodeid"
referencedTableName="node" referencedColumnNames="nodeid" />

<createIndex tableName="bridgebridgelink" indexName="bridgebridgelink_nodeid_idx">
<column name="nodeid" />
</createIndex>
<createIndex tableName="bridgestplink" indexName="bridgestplink_lastpoll_idx">
<column name="bridgestplinklastpolltime" />
<createIndex tableName="bridgebridgelink" indexName="bridgebridgelink_lastpoll_idx">
<column name="bridgebridgelinklastpolltime" />
</createIndex>
<createIndex tableName="bridgestplink" indexName="bridgestplink_pk_idx1">
<createIndex tableName="bridgebridgelink" indexName="bridgebridgelink_pk_idx">
<column name="nodeid" />
<column name="stpport" />
</createIndex>
<createIndex tableName="bridgestplink" indexName="bridgestplink_pk_idx2">
<column name="designatedbridge" />
<column name="bridgeport" />
</createIndex>

<rollback>
<dropTable tableName="bridgestplink" />
<dropTable tableName="bridgebridgelink" />
</rollback>
</changeSet>

Expand Down
22 changes: 18 additions & 4 deletions opennms-base-assembly/src/main/filtered/etc/create.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2252,6 +2252,7 @@ drop table ospfElement cascade;
drop table ospfLink cascade;
drop table isisElement cascade;
drop table isisLink cascade;
drop table ipNetToMedia cascade;
drop table bridgeElement cascade;
drop table bridgeMacLink cascade;
drop table bridgeBridgeLink cascade;
Expand Down Expand Up @@ -2350,6 +2351,18 @@ create table isisLink (
constraint fk_nodeIDisislink foreign key (nodeid) references node ON DELETE CASCADE
);

create table ipNetToMedia (
id integer default nextval('opennmsNxtId') not null,
netAddress text not null,
physAddress varchar(32) not null,
sourceNodeId integer not null,
sourceIfIndex integer not null,
createTime timestamp not null,
lastPollTime timestamp not null,
constraint pk_ipnettomedia_id primary key (id),
constraint fk_sourcenodeid_ipnettomedia foreign key (sourcenodeid) references node (nodeid)
);

create table bridgeElement (
id integer default nextval('opennmsNxtId') not null,
nodeid integer not null,
Expand All @@ -2376,7 +2389,7 @@ create table bridgeMacLink (
bridgePortIfIndex integer,
bridgePortIfName varchar(32),
vlan integer,
macAdreess varchar(12),
macAdreess varchar(12) not null,
bridgeMacLinkCreateTime timestamp not null,
bridgeMacLinkLastPollTime timestamp not null,
constraint pk_bridgemaclink_id primary key (id),
Expand All @@ -2403,17 +2416,18 @@ create table bridgeBridgeLink (
);

create table bridgeStpLink (
id integer default nextval('opennmsNxtId') not null,
nodeid integer not null,
id integer default nextval('opennmsNxtId') not null,
nodeid integer not null,
stpPort integer not null,
stpPortPriority integer not null,
stpPortState integer not null,
stpPortEnable integer not null,
stpPortPathCost integer not null,
stpPortIfIndex integer,
stpPortIfName varchar(32),
vlan integer,
designatedRoot varchar(16) not null,
designatedCost integer not null,
designatedRoot varchar(16) not null,
designatedBridge varchar(16) not null,
designatedPort varchar(4) not null,
bridgeStpLinkCreateTime timestamp not null,
Expand Down
6 changes: 6 additions & 0 deletions opennms-config-tester/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
</build>
<dependencies>
<!-- OpenNMS dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.opennms</groupId>
<artifactId>opennms-test</artifactId>
Expand Down
7 changes: 5 additions & 2 deletions opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,16 @@

import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runners.MethodSorters;
import org.opennms.core.db.DataSourceFactory;
import org.opennms.core.test.ConfigurationTestUtils;
import org.opennms.test.DaoTestConfigBean;
import org.springframework.util.StringUtils;

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class ConfigTesterTest {
private static Set<String> m_filesTested = new HashSet<String>();
private static Set<String> m_filesIgnored = new HashSet<String>();
Expand Down Expand Up @@ -601,7 +604,7 @@ public void testRemoteRepositoyConfig() {
}

@Test
public void testAllConfigs() {
public void zz001testAllConfigs() {
ConfigTester.main(new String[] { "-a" });
}

Expand All @@ -621,7 +624,7 @@ private void ignoreConfigFile(String file) {
}

@Test
public void testCheckAllDaemonXmlConfigFilesTested() {
public void zz002testCheckAllDaemonXmlConfigFilesTested() {
File someConfigFile = ConfigurationTestUtils.getFileForConfigFile("discovery-configuration.xml");
File configDir = someConfigFile.getParentFile();
assertTrue("daemon configuration directory exists at " + configDir.getAbsolutePath(), configDir.exists());
Expand Down
Loading

0 comments on commit 1d5af42

Please sign in to comment.