import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Host;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaRepository;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter;
}
if (userCapabilities.isPresent()) {
for (QName qname : userCapabilities.get().getModuleBasedCaps()) {
- final SourceIdentifier sourceIdentifier = new SourceIdentifier(qname.getLocalName(), qname.getFormattedRevision());
- dto.getSchemaRegistry().registerSchemaSource(DEFAULT_CACHE, PotentialSchemaSource.create(sourceIdentifier, YangTextSchemaSource.class, LOCAL_IO_FALLBACK_COST));
+ final SourceIdentifier sourceIdentifier = RevisionSourceIdentifier
+ .create(qname.getLocalName(), qname.getFormattedRevision());
+ dto.getSchemaRegistry().registerSchemaSource(DEFAULT_CACHE, PotentialSchemaSource
+ .create(sourceIdentifier, YangTextSchemaSource.class, LOCAL_IO_FALLBACK_COST));
}
}
}
import org.opendaylight.yangtools.yang.data.impl.schema.transform.dom.parser.DomToNormalizedNodeParserFactory;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
final SourceIdentifier sourceId = revision.isPresent()
- ? new SourceIdentifier(moduleName, revision.get())
- : new SourceIdentifier(moduleName);
+ ? RevisionSourceIdentifier.create(moduleName, revision.get())
+ : RevisionSourceIdentifier.create(moduleName);
try {
return Optional.<Map.Entry<SourceIdentifier, URL>>of(new AbstractMap.SimpleImmutableEntry<>(
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceException;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaResolutionException;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation;
public static final Function<QName, SourceIdentifier> QNAME_TO_SOURCE_ID_FUNCTION = new Function<QName, SourceIdentifier>() {
@Override
public SourceIdentifier apply(final QName input) {
- return new SourceIdentifier(input.getLocalName(), Optional.fromNullable(input.getFormattedRevision()));
+ return RevisionSourceIdentifier
+ .create(input.getLocalName(), Optional.fromNullable(input.getFormattedRevision()));
}
};
import java.net.URL;
import java.util.Collections;
import java.util.Map;
-import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
-import org.opendaylight.netconf.sal.connect.netconf.LibraryModulesSchemas;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
public class LibraryModulesSchemasTest {
final Map<SourceIdentifier, URL> resolvedModulesSchema = libraryModulesSchemas.getAvailableModels();
Assert.assertThat(resolvedModulesSchema.size(), is(3));
- Assert.assertTrue(resolvedModulesSchema.containsKey(new SourceIdentifier("module-with-revision", "2014-04-08")));
+ Assert.assertTrue(resolvedModulesSchema.containsKey(RevisionSourceIdentifier.create("module-with-revision",
+ "2014-04-08")));
Assert.assertThat(resolvedModulesSchema.get(
- new SourceIdentifier("module-with-revision", "2014-04-08")),
+ RevisionSourceIdentifier.create("module-with-revision", "2014-04-08")),
is(new URL("http://localhost:8181/yanglib/schemas/module-with-revision/2014-04-08")));
Assert.assertTrue(resolvedModulesSchema.containsKey(
- new SourceIdentifier("another-module-with-revision", "2013-10-21")));
+ RevisionSourceIdentifier.create("another-module-with-revision", "2013-10-21")));
Assert.assertThat(resolvedModulesSchema.get(
- new SourceIdentifier("another-module-with-revision", "2013-10-21")),
+ RevisionSourceIdentifier.create("another-module-with-revision", "2013-10-21")),
is(new URL("http://localhost:8181/yanglib/schemas/another-module-with-revision/2013-10-21")));
- Assert.assertTrue(resolvedModulesSchema.containsKey(new SourceIdentifier("module-without-revision")));
+ Assert.assertTrue(resolvedModulesSchema.containsKey(
+ RevisionSourceIdentifier.create("module-without-revision")));
Assert.assertThat(resolvedModulesSchema.get(
- new SourceIdentifier("module-without-revision")),
+ RevisionSourceIdentifier.create("module-without-revision")),
is(new URL("http://localhost:8181/yanglib/schemas/module-without-revision/")));
}
final Map<SourceIdentifier, URL> resolvedModulesSchema = libraryModulesSchemas.getAvailableModels();
Assert.assertThat(resolvedModulesSchema.size(), is(1));
- Assert.assertFalse(resolvedModulesSchema.containsKey(new SourceIdentifier("module-with-bad-url")));
Assert.assertFalse(resolvedModulesSchema.containsKey(
- new SourceIdentifier("module-with-bad-revision", "bad-revision")));
- Assert.assertTrue(resolvedModulesSchema.containsKey(new SourceIdentifier("good-ol-module")));
+ RevisionSourceIdentifier.create("module-with-bad-url")));
+ Assert.assertFalse(resolvedModulesSchema.containsKey(
+ RevisionSourceIdentifier.create("module-with-bad-revision", "bad-revision")));
+ Assert.assertTrue(resolvedModulesSchema.containsKey(
+ RevisionSourceIdentifier.create("good-ol-module")));
}
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.model.api.SchemaPath;
import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceException;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaResolutionException;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
public static final String TEST_NAMESPACE = "test:namespace";
public static final String TEST_MODULE = "test-module";
public static final String TEST_REVISION = "2013-07-22";
- public static final SourceIdentifier TEST_SID = new SourceIdentifier(TEST_MODULE, Optional.of(TEST_REVISION));
+ public static final SourceIdentifier TEST_SID =
+ RevisionSourceIdentifier.create(TEST_MODULE, Optional.of(TEST_REVISION));
public static final String TEST_CAPABILITY = TEST_NAMESPACE + "?module=" + TEST_MODULE + "&revision=" + TEST_REVISION;
- public static final SourceIdentifier TEST_SID2 = new SourceIdentifier(TEST_MODULE + "2", Optional.of(TEST_REVISION));
+ public static final SourceIdentifier TEST_SID2 =
+ RevisionSourceIdentifier.create(TEST_MODULE + "2", Optional.of(TEST_REVISION));
public static final String TEST_CAPABILITY2 = TEST_NAMESPACE + "?module=" + TEST_MODULE + "2" + "&revision=" + TEST_REVISION;
private static final NetconfStateSchemas.NetconfStateSchemasResolver stateSchemasResolver = new NetconfStateSchemas.NetconfStateSchemasResolver() {
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
@Before
public void setUp() throws Exception {
final URL url = getClass().getResource("/schemas/config-test-rpc.yang");
- workingSid = new SourceIdentifier("abc", Optional.<String>absent());
+ workingSid = RevisionSourceIdentifier.create("abc", Optional.<String>absent());
final Map<SourceIdentifier, URL> sourceIdentifierURLMap = Collections.singletonMap(workingSid, url);
final RemoteDeviceId id = new RemoteDeviceId("id", new InetSocketAddress("localhost", 22));
yangLibrarySchemaYangSourceProvider = new YangLibrarySchemaYangSourceProvider(id, sourceIdentifierURLMap);
@Test(expected = IllegalArgumentException.class)
public void testGetSourceNotAvailable() throws Exception {
- yangLibrarySchemaYangSourceProvider.getSource(new SourceIdentifier("aaaaa", "0000-00-00"));
+ yangLibrarySchemaYangSourceProvider.getSource(RevisionSourceIdentifier.create("aaaaa", "0000-00-00"));
}
}
\ No newline at end of file
import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaResolutionException;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter;
}
private void addDefaultSchemas(final SharedSchemaRepository consumer) {
- SourceIdentifier sId = new SourceIdentifier("ietf-netconf-monitoring", "2010-10-04");
+ SourceIdentifier sId = RevisionSourceIdentifier.create("ietf-netconf-monitoring", "2010-10-04");
registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring.yang", sId);
- sId = new SourceIdentifier("ietf-netconf-monitoring-extension", "2013-12-10");
+ sId = RevisionSourceIdentifier.create("ietf-netconf-monitoring-extension", "2013-12-10");
registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring-extension.yang", sId);
- sId = new SourceIdentifier("ietf-yang-types", "2010-09-24");
+ sId = RevisionSourceIdentifier.create("ietf-yang-types", "2010-09-24");
registerSource(consumer, "/META-INF/yang/ietf-yang-types.yang", sId);
- sId = new SourceIdentifier("ietf-inet-types", "2010-09-24");
+ sId = RevisionSourceIdentifier.create("ietf-inet-types", "2010-09-24");
registerSource(consumer, "/META-INF/yang/ietf-inet-types.yang", sId);
}
import com.google.common.io.ByteStreams;
import com.google.common.util.concurrent.CheckedFuture;
import java.io.IOException;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
import org.opendaylight.yanglib.api.YangLibService;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceException;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
Preconditions.checkNotNull(schemaRepository, "Schema repository is not initialized");
LOG.debug("Attempting load for schema source {}:{}", name, revision);
final SourceIdentifier sourceId =
- new SourceIdentifier(name, Optional.fromNullable(revision.equals("") ? null : revision));
+ RevisionSourceIdentifier.create(name, Optional.fromNullable(revision.equals("") ? null : revision));
final CheckedFuture<YangTextSchemaSource, SchemaSourceException> sourceFuture =
schemaRepository.getSchemaSource(sourceId, YangTextSchemaSource.class);
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.module.list.ModuleKey;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.YangIdentifier;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
+import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
import org.opendaylight.yangtools.yang.model.repo.api.YinSchemaSourceRepresentation;
import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource;
List<PotentialSchemaSource<?>> list = new ArrayList<>();
list.add(
- PotentialSchemaSource.create(new SourceIdentifier("no-revision"),
+ PotentialSchemaSource.create(
+ RevisionSourceIdentifier.create("no-revision"),
YangTextSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue()));
list.add(
- PotentialSchemaSource.create(new SourceIdentifier("with-revision", "2016-04-28"),
+ PotentialSchemaSource.create(
+ RevisionSourceIdentifier.create("with-revision", "2016-04-28"),
YangTextSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue()));
when(writeTransaction.submit()).thenReturn(Futures.immediateCheckedFuture(null));
// expected behavior is to do nothing
potentialSources = new ArrayList<>();
potentialSources.add(
- PotentialSchemaSource.create(new SourceIdentifier("yin-source-representation"),
+ PotentialSchemaSource.create(
+ RevisionSourceIdentifier.create("yin-source-representation"),
YinSchemaSourceRepresentation.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue()));
potentialSources.add(
- PotentialSchemaSource.create(new SourceIdentifier("asts-schema-source"),
+ PotentialSchemaSource.create(
+ RevisionSourceIdentifier.create("asts-schema-source"),
ASTSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue()));
yangLibProvider.schemaSourceRegistered(potentialSources);
// add yang schema source to list
potentialSources.add(
- PotentialSchemaSource.create(new SourceIdentifier("yang-schema-source"),
+ PotentialSchemaSource.create(
+ RevisionSourceIdentifier.create("yang-schema-source"),
YangTextSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue()));
when(dataBroker.newWriteOnlyTransaction()).thenReturn(writeTransaction);
yangLibProvider.onSessionInitiated(context);
final PotentialSchemaSource<YinSchemaSourceRepresentation> nonYangSource =
- PotentialSchemaSource.create(new SourceIdentifier("yin-source-representation"),
+ PotentialSchemaSource.create(
+ RevisionSourceIdentifier.create("yin-source-representation"),
YinSchemaSourceRepresentation.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue());
yangLibProvider.schemaSourceUnregistered(nonYangSource);
when(writeTransaction.submit()).thenReturn(Futures.immediateCheckedFuture(null));
PotentialSchemaSource<YangTextSchemaSource> yangUnregistererSource =
- PotentialSchemaSource.create(new SourceIdentifier("unregistered-yang-schema-without-revision"),
+ PotentialSchemaSource.create(
+ RevisionSourceIdentifier.create("unregistered-yang-schema-without-revision"),
YangTextSchemaSource.class, PotentialSchemaSource.Costs.LOCAL_IO.getValue());
yangLibProvider.schemaSourceUnregistered(yangUnregistererSource);
verify(writeTransaction).submit();
yangUnregistererSource =
- PotentialSchemaSource.create(new SourceIdentifier("unregistered-yang-with-revision", "2016-04-28"),
+ PotentialSchemaSource.create(
+ RevisionSourceIdentifier.create("unregistered-yang-with-revision", "2016-04-28"),
YangTextSchemaSource.class, PotentialSchemaSource.Costs.LOCAL_IO.getValue());
yangLibProvider.schemaSourceUnregistered(yangUnregistererSource);