+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
package org.opendaylight.controller.mdsal.it.base;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
import static org.ops4j.pax.exam.CoreOptions.composite;
-import java.util.Calendar;
-
import javax.inject.Inject;
import org.junit.Before;
import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
import org.ops4j.pax.exam.util.Filter;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static final int REGISTRATION_TIMEOUT = 70000;
@Inject @Filter(timeout=60000)
private BundleContext context;
+ @Inject @Filter(timeout=60000)
+ private BindingAwareBroker broker;
private ProviderContext session = null;
public ProviderContext getSession() {
@Before
public void setup() throws Exception {
super.setup();
- Calendar start = Calendar.getInstance();
- ServiceReference<BindingAwareBroker> serviceReference = context.getServiceReference(BindingAwareBroker.class);
- if(serviceReference == null) {
- throw new RuntimeException("BindingAwareBroker not found");
- }
- BindingAwareBroker broker = context.getService(serviceReference);
+ long start = System.nanoTime();
broker.registerProvider(this);
for(int i=0;i<REGISTRATION_TIMEOUT;i++) {
if(session !=null) {
- Calendar stop = Calendar.getInstance();
- LOG.info("Registered session {} with the MD-SAL after {} ms",
+ long stop = System.nanoTime();
+ LOG.info("Registered session {} with the MD-SAL after {} ns",
session,
- stop.getTimeInMillis() - start.getTimeInMillis());
+ stop - start);
return;
} else {
Thread.sleep(1);
@Override
public Option getLoggingOption() {
Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
- logConfiguration(AbstractMdsalTestBase.class),
- LogLevel.INFO.name());
+ "log4j2.logger.mdsal-it-base.name",
+ AbstractMdsalTestBase.class.getPackage().getName());
+ option = composite(option, editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
+ "log4j2.logger.mdsal-it-base.level",
+ LogLevel.INFO.name()));
option = composite(option, super.getLoggingOption());
return option;
}