import org.opendaylight.controller.config.yang.md.sal.binding.impl.BindingAsyncDataBrokerImplModuleMXBean;
import org.opendaylight.controller.config.yang.md.sal.binding.impl.RuntimeMappingModuleFactory;
import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomBrokerImplModuleFactory;
-import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomBrokerImplModuleMXBean;
import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomInmemoryDataBrokerModuleFactory;
import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomInmemoryDataBrokerModuleMXBean;
import org.opendaylight.controller.config.yang.md.sal.dom.impl.SchemaServiceImplSingletonModuleFactory;
final ObjectName nameCreated = transaction.createModule(BindingAsyncDataBrokerImplModuleFactory.NAME, BINDING_ASYNC_BROKER_INSTANCE_NAME);
final BindingAsyncDataBrokerImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, BindingAsyncDataBrokerImplModuleMXBean.class);
mxBean.setBindingMappingService(lookupMappingServiceInstance(transaction));
- mxBean.setDomAsyncBroker(lookupDomBrokerInstance(transaction));
- return nameCreated;
- }
-
- private static ObjectName createDomAsyncDataBroker(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
- final ObjectName nameCreated = transaction.createModule(DomInmemoryDataBrokerModuleFactory.NAME, DOM_ASYNC_DATA_BROKER_INSTANCE);
- final DomInmemoryDataBrokerModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, DomInmemoryDataBrokerModuleMXBean.class);
+ mxBean.setDomAsyncBroker(lookupDomAsyncDataBroker(transaction));
mxBean.setSchemaService(lookupSchemaServiceInstance(transaction));
return nameCreated;
}
- private static ObjectName lookupMappingServiceInstance(final ConfigTransactionJMXClient transaction) {
+ private static ObjectName lookupDomAsyncDataBroker(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
try {
- return transaction.lookupConfigBean(RuntimeMappingModuleFactory.NAME, RuntimeMappingModuleFactory.SINGLETON_NAME);
+ return transaction.lookupConfigBean(DomInmemoryDataBrokerModuleFactory.NAME, DOM_ASYNC_DATA_BROKER_INSTANCE);
} catch (InstanceNotFoundException e) {
try {
- return transaction.createModule(RuntimeMappingModuleFactory.NAME, RuntimeMappingModuleFactory.SINGLETON_NAME);
+ final ObjectName nameCreated = transaction.createModule(DomInmemoryDataBrokerModuleFactory.NAME, DOM_ASYNC_DATA_BROKER_INSTANCE);
+ final DomInmemoryDataBrokerModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, DomInmemoryDataBrokerModuleMXBean.class);
+ mxBean.setSchemaService(lookupSchemaServiceInstance(transaction));
+ return nameCreated;
} catch (InstanceAlreadyExistsException e1) {
throw new IllegalStateException(e1);
}
}
}
- private static ObjectName lookupSchemaServiceInstance(final ConfigTransactionJMXClient transaction) {
+ private static ObjectName lookupMappingServiceInstance(final ConfigTransactionJMXClient transaction) {
try {
- return transaction.lookupConfigBean(SchemaServiceImplSingletonModuleFactory.NAME, SchemaServiceImplSingletonModuleFactory.SINGLETON_NAME);
+ return transaction.lookupConfigBean(RuntimeMappingModuleFactory.NAME, RuntimeMappingModuleFactory.SINGLETON_NAME);
} catch (InstanceNotFoundException e) {
try {
- return transaction.createModule(SchemaServiceImplSingletonModuleFactory.NAME, SchemaServiceImplSingletonModuleFactory.SINGLETON_NAME);
+ return transaction.createModule(RuntimeMappingModuleFactory.NAME, RuntimeMappingModuleFactory.SINGLETON_NAME);
} catch (InstanceAlreadyExistsException e1) {
throw new IllegalStateException(e1);
}
}
}
- public static ObjectName lookupDomBrokerInstance(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
+ private static ObjectName lookupSchemaServiceInstance(final ConfigTransactionJMXClient transaction) {
try {
- return transaction.lookupConfigBean(DomBrokerImplModuleFactory.NAME, DOM_BROKER_INSTANCE_NAME);
+ return transaction.lookupConfigBean(SchemaServiceImplSingletonModuleFactory.NAME, SchemaServiceImplSingletonModuleFactory.SINGLETON_NAME);
} catch (InstanceNotFoundException e) {
try {
- final ObjectName nameCreated = transaction.createModule(DomBrokerImplModuleFactory.NAME, DOM_BROKER_INSTANCE_NAME);
- final DomBrokerImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, DomBrokerImplModuleMXBean.class);
- mxBean.setAsyncDataBroker(createDomAsyncDataBroker(transaction));
- return nameCreated;
+ return transaction.createModule(SchemaServiceImplSingletonModuleFactory.NAME, SchemaServiceImplSingletonModuleFactory.SINGLETON_NAME);
} catch (InstanceAlreadyExistsException e1) {
throw new IllegalStateException(e1);
}
public void testCreateInstance() throws Exception {
final CommitStatus status = createApplicationPeerInsatnce();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 15, 0, 0);
+ assertStatus(status, 14, 0, 0);
}
@Test
assertBeanCount(1, FACTORY_NAME);
final CommitStatus status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 0, 15);
+ assertStatus(status, 0, 0, 14);
}
@Test
mxBean.setApplicationRibId(new ApplicationRibId(NEW_APP_RIB_ID));
final CommitStatus status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 1, 14);
+ assertStatus(status, 0, 1, 13);
assertEquals(NEW_APP_RIB_ID, getApplicationRibId());
}
public void testCreateBean() throws Exception {
final CommitStatus status = createBgpPeerInstance();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 17, 0, 0);
+ assertStatus(status, 16, 0, 0);
}
@Test
NativeTestSupport.assumeSupportedPlatform();
final CommitStatus status = createBgpPeerInstance(true);
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 19, 0, 0);
+ assertStatus(status, 18, 0, 0);
}
@Test
assertBeanCount(1, FACTORY_NAME);
status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 0, 17);
+ assertStatus(status, 0, 0, 16);
}
@Test
mxBean.setPort(new PortNumber(10));
status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 1, 16);
+ assertStatus(status, 0, 1, 15);
}
private ObjectName createBgpPeerInstance(final ConfigTransactionJMXClient transaction, final String host,
public void testCreateBean() throws Exception {
final CommitStatus status = createInstance();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 14, 0, 0);
+ assertStatus(status, 13, 0, 0);
}
@Test
assertBeanCount(1, FACTORY_NAME);
final CommitStatus status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 0, 14);
+ assertStatus(status, 0, 0, 13);
}
@Test
mxBean.setLocalAs(100L);
final CommitStatus status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 1, 13);
+ assertStatus(status, 0, 1, 12);
}
}
import static org.junit.Assert.fail;
import java.util.List;
-
import javax.management.ObjectName;
-
import org.junit.Test;
import org.opendaylight.controller.config.api.ValidationException;
import org.opendaylight.controller.config.api.jmx.CommitStatus;
public void testCreateBean() throws Exception {
final CommitStatus status = createIpv4ReachabilityTopoBuilderModuleInstance();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 15, 0, 0);
+ assertStatus(status, 14, 0, 0);
}
@Test
assertBeanCount(1, FACTORY_NAME);
final CommitStatus status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 0, 15);
+ assertStatus(status, 0, 0, 14);
}
@Test
mxBean.setTopologyId(new TopologyId("new-bgp-topology"));
final CommitStatus status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 1, 14);
+ assertStatus(status, 0, 1, 13);
}
private CommitStatus createIpv4ReachabilityTopoBuilderModuleInstance() throws Exception {
import static org.junit.Assert.fail;
import java.util.List;
-
import javax.management.ObjectName;
-
import org.junit.Test;
import org.opendaylight.controller.config.api.ValidationException;
import org.opendaylight.controller.config.api.jmx.CommitStatus;
public void testCreateBean() throws Exception {
final CommitStatus status = createIpv6ReachabilityTopoBuilderModuleInstance();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 15, 0, 0);
+ assertStatus(status, 14, 0, 0);
}
@Test
assertBeanCount(1, FACTORY_NAME);
final CommitStatus status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 0, 15);
+ assertStatus(status, 0, 0, 14);
}
@Test
mxBean.setTopologyId(new TopologyId("new-bgp-topology"));
final CommitStatus status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 1, 14);
+ assertStatus(status, 0, 1, 13);
}
private CommitStatus createIpv6ReachabilityTopoBuilderModuleInstance() throws Exception {
public void testCreateBean() throws Exception {
final CommitStatus status = createLinkstateTopologyBuilderModuleInstance();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 15, 0, 0);
+ assertStatus(status, 14, 0, 0);
}
@Test
assertBeanCount(1, FACTORY_NAME);
final CommitStatus status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 0, 15);
+ assertStatus(status, 0, 0, 14);
}
@Test
mxBean.setTopologyId(new TopologyId("new-bgp-topology"));
final CommitStatus status = transaction.commit();
assertBeanCount(1, FACTORY_NAME);
- assertStatus(status, 0, 1, 14);
+ assertStatus(status, 0, 1, 13);
}
private CommitStatus createLinkstateTopologyBuilderModuleInstance() throws Exception {
return (AutoCloseable) DataChangeCounterImplModuleTest.this.dataBorker;
}
+ @Override
+ public ObjectName getSchemaService() {
+ return null;
+ }
+
+ @Override
+ public void setSchemaService(ObjectName schemaService) {
+ return;
+ }
+
}
private interface CloseableDataBroker extends DataBroker, AutoCloseable {
<name>binding-async-data-broker</name>
<binding-forwarded-data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
<dom-async-broker>
- <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
- <name>dom-broker</name>
+ <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type>
+ <name>inmemory-data-broker</name>
</dom-async-broker>
<binding-mapping-service>
<type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
<name>runtime-mapping-singleton</name>
</binding-mapping-service>
+ <schema-service>
+ <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
+ <name>yang-schema-service</name>
+ </schema-service>
</binding-forwarded-data-broker>
</module>
</modules>
final ObjectName nameCreated = transaction.createModule(BindingAsyncDataBrokerImplModuleFactory.NAME, BINDING_ASYNC_BROKER_INSTANCE_NAME);
final BindingAsyncDataBrokerImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, BindingAsyncDataBrokerImplModuleMXBean.class);
mxBean.setBindingMappingService(lookupMappingServiceInstance(transaction));
- mxBean.setDomAsyncBroker(lookupDomBrokerInstance(transaction));
- return nameCreated;
- }
-
- private static ObjectName createDomAsyncDataBroker(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
- final ObjectName nameCreated = transaction.createModule(DomInmemoryDataBrokerModuleFactory.NAME, DOM_ASYNC_DATA_BROKER_INSTANCE);
- final DomInmemoryDataBrokerModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, DomInmemoryDataBrokerModuleMXBean.class);
+ mxBean.setDomAsyncBroker(lookupDomAsyncDataBroker(transaction));
mxBean.setSchemaService(lookupSchemaServiceInstance(transaction));
return nameCreated;
}
try {
final ObjectName nameCreated = transaction.createModule(DomBrokerImplModuleFactory.NAME, DOM_BROKER_INSTANCE_NAME);
final DomBrokerImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, DomBrokerImplModuleMXBean.class);
- mxBean.setAsyncDataBroker(createDomAsyncDataBroker(transaction));
+ mxBean.setAsyncDataBroker(lookupDomAsyncDataBroker(transaction));
+ return nameCreated;
+ } catch (final InstanceAlreadyExistsException e1) {
+ throw new IllegalStateException(e1);
+ }
+ }
+ }
+
+ private static ObjectName lookupDomAsyncDataBroker(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
+ try {
+ return transaction.lookupConfigBean(DomInmemoryDataBrokerModuleFactory.NAME, DOM_ASYNC_DATA_BROKER_INSTANCE);
+ } catch (final InstanceNotFoundException e) {
+ try {
+ final ObjectName nameCreated = transaction.createModule(DomInmemoryDataBrokerModuleFactory.NAME, DOM_ASYNC_DATA_BROKER_INSTANCE);
+ final DomInmemoryDataBrokerModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, DomInmemoryDataBrokerModuleMXBean.class);
+ mxBean.setSchemaService(lookupSchemaServiceInstance(transaction));
return nameCreated;
} catch (final InstanceAlreadyExistsException e1) {
throw new IllegalStateException(e1);