You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2018/05/09 13:41:21 UTC
[1/5] qpid-dispatch git commit: DISPATCH-989 Removing this testing
tool
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 95d1ba5e1 -> fe1f711e2
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/topologies/schema.json
----------------------------------------------------------------------
diff --git a/console/test/topologies/schema.json b/console/test/topologies/schema.json
deleted file mode 100644
index c105e16..0000000
--- a/console/test/topologies/schema.json
+++ /dev/null
@@ -1,1814 +0,0 @@
-{
- "prefix": "org.apache.qpid.dispatch",
- "entityTypes": {
- "address": {
- "operations": [
- "CREATE",
- "DELETE",
- "READ"
- ],
- "attributes": {
- "egressPhase": {
- "type": "integer",
- "description": "Advanced - Override the egress phase for this address"
- },
- "pattern": {
- "type": "string",
- "description": "A wildcarded pattern for address matching. Incoming addresses are matched against this pattern. Matching addresses use the configured settings. The pattern consists of one or more tokens separated by a forward slash '/'. A token can be one of the following: a * character, a # character, or a sequence of characters that do not include /, *, or #. The * token matches any single token. The # token matches zero or more tokens. * has higher precedence than #, and exact match has the highest precedence. Cannot be used with a prefix attribute."
- },
- "prefix": {
- "type": "string",
- "description": "The address prefix for the configured settings. Cannot be used with a pattern attribute."
- },
- "ingressPhase": {
- "type": "integer",
- "description": "Advanced - Override the ingress phase for this address"
- },
- "waypoint": {
- "type": "boolean",
- "description": "Designates this address space as being used for waypoints. This will cause the proper address-phasing to be used."
- },
- "distribution": {
- "default": "balanced",
- "type": [
- "multicast",
- "closest",
- "balanced",
- "unavailable"
- ],
- "description": "Treatment of traffic associated with the address"
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.router.config.address",
- "description": "Entity type for address configuration. This is used to configure the treatment of message-routed deliveries within a particular address-space. The configuration controls distribution and address phasing."
- },
- "binding": {
- "operations": [
- "CREATE",
- "DELETE",
- "READ"
- ],
- "attributes": {
- "matchedCount": {
- "type": "integer",
- "description": "Total number of deliveries that matched this binding."
- },
- "bindingKey": {
- "type": "string",
- "description": "Pattern to compare against incoming message's subject. The key is a string of zero or more tokens and wildcards. The format depends on the matchMethod configured for the exchange. For AMQP each token is delimited by the '.' character and wild-card tokens '*' matches a single token and '#' matches zero or more tokens. For MQTT each token is delimited by the '/' character and wildcard tokens '+' matches a single token and '#' matches zero or more tokens at the end of the topic. If a key is not provided the binding will match all messages arriving at the exchange (fanout behavior)."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "nextHopAddress": {
- "required": true,
- "type": "string",
- "description": "The address to forward the message to when the message's topic string matches the binding key pattern. This address is used by message consumers as the source of incoming messages."
- },
- "exchangeName": {
- "required": true,
- "type": "string",
- "description": "The name of the exchange to bind."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "nextHopPhase": {
- "type": "integer",
- "description": "The address phase used when forwarding messages that match this binding."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.router.config.binding",
- "description": "[EXPERIMENTAL] Defines a keyed next hop binding for a topic exchange. The subject field of the messages arriving at the exchange is compared against the binding's key value using the exchange's matchMethod. If the subject matches the key the message is forwarded to the nextHopAddress. The nextHopAddress overrides the message's original destination."
- },
- "entity": {
- "attributes": {
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.entity",
- "description": "Base entity type for all entities."
- },
- "sslProfile": {
- "operations": [
- "CREATE",
- "DELETE",
- "READ"
- ],
- "attributes": {
- "certFile": {
- "type": "path",
- "description": "The absolute path to the file containing the PEM-formatted public certificate to be used on the local end of any connections using this profile."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "uidNameMappingFile": {
- "type": "string",
- "description": "The absolute path to the file containing the unique id to display name mapping"
- },
- "ciphers": {
- "type": "string",
- "description": "Specifies the enabled ciphers so the SSL Ciphers can be hardened. In other words, use this field to disable weak ciphers. The ciphers are specified in the format understood by the OpenSSL library. For example, ciphers can be set to ALL:!aNULL:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP; -- The full list of allowed ciphers can be viewed using the openssl ciphers command"
- },
- "caCertFile": {
- "type": "path",
- "description": "The absolute path to the database that contains the public certificates of trusted certificate authorities (CA)."
- },
- "uidFormat": {
- "type": "string",
- "description": "A list of x509 client certificate fields that will be used to build a string that will uniquely identify the client certificate owner. For e.g. a value of 'cou' indicates that the uid will consist of c - common name concatenated with o - organization-company name concatenated with u - organization unit; or a value of 'o2' indicates that the uid will consist of o (organization name) concatenated with 2 (the sha256 fingerprint of the entire certificate) . Allowed values can be any combination of 'c'( ISO3166 two character country code), 's'(state or province), 'l'(Locality; generally - city), 'o'(Organization - Company Name), 'u'(Organization Unit - typically certificate type or brand), 'n'(CommonName - typically a user name for client certificates) and '1'(sha1 certificate fingerprint, as displayed in the fingerprints section when looking at a certificate with say a web browser is the hash of the entire certificate) and 2 (sha256 certificate fingerprint) and
5 (sha512 certificate fingerprint). The user identifier (uid) that is generated based on the uidFormat is a string which has a semi-colon as a separator between the components"
- },
- "privateKeyFile": {
- "type": "path",
- "description": "The absolute path to the file containing the PEM-formatted private key for the above certificate."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "passwordFile": {
- "type": "path",
- "description": "If the above private key is password protected, this is the absolute path to a file containing the password that unlocks the certificate key."
- },
- "password": {
- "type": "string",
- "description": "An alternative to storing the password in a file referenced by passwordFile is to supply the password right here in the configuration file. This takes precedence over the passwordFile if both are specified."
- },
- "protocols": {
- "type": "string",
- "description": "The TLS protocols that this sslProfile can use. You can specify a list of one or more of TLSv1, TLSv1.1, or TLSv1.2. To specify multiple protocols, separate the protocols with a space. For example, to permit the sslProfile to use TLS v1.1 and TLS v1.2 only, you would set the value to TLSv1.1 TLSv1.2. If you do not specify a value, the sslProfile uses the TLS protocol specified by the system-wide configuration."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.sslProfile",
- "description": "Attributes for setting TLS/SSL configuration for connections."
- },
- "linkRoute": {
- "operations": [
- "CREATE",
- "DELETE",
- "READ"
- ],
- "attributes": {
- "direction": {
- "required": true,
- "type": [
- "in",
- "out"
- ],
- "description": "The permitted direction of links: 'in' means client senders; 'out' means client receivers"
- },
- "containerId": {
- "type": "string",
- "description": "ContainerID for the target container. Only one of containerId or connection should be specified for a linkRoute. Specifying both will result in the linkRoute not being created."
- },
- "operStatus": {
- "type": [
- "inactive",
- "active"
- ],
- "description": "The operational status of this linkRoute: inactive - The remote container is not connected; active - the remote container is connected and ready to accept link routed attachments."
- },
- "pattern": {
- "type": "string",
- "description": "A wildcarded pattern for address matching. Link addresses are matched against this pattern. Matching addresses use the configured settings. The pattern consists of one or more tokens separated by a forward slash '/'. A token can be one of the following: a * character, a # character, or a sequence of characters that do not include /, *, or #. The * token matches any single token. The # token matches zero or more tokens. * has higher precedence than #, and exact match has the highest precedence. Cannot be used with the prefix attribute."
- },
- "prefix": {
- "type": "string",
- "description": "The address prefix for the configured settings. Cannot be used with the pattern attribute."
- },
- "connection": {
- "type": "string",
- "description": "The name from a connector or listener. Only one of containerId or connection should be specified for a linkRoute. Specifying both will result in the linkRoute not being created."
- },
- "distribution": {
- "default": "linkBalanced",
- "type": [
- "linkBalanced"
- ],
- "description": "Treatment of traffic associated with the address"
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.router.config.linkRoute",
- "description": "Entity type for link-route configuration. This is used to identify remote containers that shall be destinations for routed link-attaches. The link-routing configuration applies to an addressing space defined by a prefix or a pattern."
- },
- "exchange": {
- "operations": [
- "CREATE",
- "DELETE",
- "READ"
- ],
- "attributes": {
- "divertedCount": {
- "type": "integer",
- "description": "A count of those deliveries that were forwarded via the alternateAddress only. This is a subset of the forwardedCount."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "matchMethod": {
- "default": "amqp",
- "type": [
- "amqp",
- "mqtt"
- ],
- "description": "Key matching algorithm used. 'amqp' uses the legacy AMQP topic exchange wildcard match method as described in the pre-1.0 drafts. 'mqtt' uses the MQTT topic filter wildcard match method."
- },
- "forwardedCount": {
- "type": "integer",
- "description": "The total number of deliveries forwarded via matched bindings or to the alternateAddress"
- },
- "alternatePhase": {
- "type": "integer",
- "description": "The address phase for the alternateAddress. Defaults to '0'."
- },
- "receivedCount": {
- "type": "integer",
- "description": "The total number of deliveries received by this exchange."
- },
- "bindingCount": {
- "type": "integer",
- "description": "The number of bindings associated with this exchange."
- },
- "address": {
- "required": true,
- "type": "string",
- "description": "The address of the exchange. Used by the message publisher as the target for sending messages."
- },
- "phase": {
- "type": "integer",
- "description": "The address phase for the exchange. Defaults to '0'."
- },
- "alternateAddress": {
- "type": "string",
- "description": "The address to forward the message to if no bindings are matched."
- },
- "droppedCount": {
- "type": "integer",
- "description": "The total number of deliveries dropped due to the lack of an outgoing subscription."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.router.config.exchange",
- "description": "[EXPERIMENTAL] Defines a topic exchange."
- },
- "management": {
- "operations": [
- "GET-SCHEMA",
- "GET-JSON-SCHEMA",
- "GET-LOG",
- "PROFILE",
- "QUERY",
- "GET-TYPES",
- "GET-ANNOTATIONS",
- "GET-OPERATIONS",
- "GET-ATTRIBUTES",
- "GET-MGMT-NODES",
- "READ"
- ],
- "attributes": {
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "singleton": true,
- "fullyQualifiedType": "org.apache.qpid.dispatch.management",
- "description": "Qpid dispatch router extensions to the standard org.amqp.management interface."
- },
- "console": {
- "operations": [
- "READ"
- ],
- "singleton": true,
- "fullyQualifiedType": "org.apache.qpid.dispatch.console",
- "description": "(DEPRECATED) Start a websocket/tcp proxy and http file server to serve the web console",
- "deprecated": true,
- "attributes": {
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "args": {
- "type": "string",
- "description": "Optional args to pass the proxy program for logging, authentication, etc."
- },
- "listener": {
- "type": "string",
- "description": "The name of the listener to send the proxied tcp traffic to."
- },
- "proxy": {
- "required": true,
- "type": "string",
- "description": "The full path to the proxy program to run."
- },
- "wsport": {
- "default": 5673,
- "type": "integer",
- "description": "port on which to listen for websocket traffic"
- },
- "home": {
- "required": true,
- "type": "string",
- "description": "The full path to the html/css/js files for the console."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- }
- },
- "log": {
- "operations": [
- "UPDATE",
- "READ"
- ],
- "attributes": {
- "enable": {
- "type": "string",
- "description": "Levels are: trace, debug, info, notice, warning, error, critical. The enable string is a comma-separated list of levels. A level may have a trailing '\\+' to enable that level and above. For example 'trace,debug,warning+' means enable trace, debug, warning, error and critical. The value 'none' means disable logging for the module."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "module": {
- "required": true,
- "type": [
- "ROUTER",
- "ROUTER_CORE",
- "ROUTER_HELLO",
- "ROUTER_LS",
- "ROUTER_MA",
- "MESSAGE",
- "SERVER",
- "AGENT",
- "CONTAINER",
- "ERROR",
- "POLICY",
- "HTTP",
- "CONN_MGR",
- "PYTHON",
- "DEFAULT"
- ],
- "description": "Module to configure. The special module 'DEFAULT' specifies defaults for all modules."
- },
- "outputFile": {
- "type": "string",
- "description": "Where to send log messages. Can be 'stderr', 'stdout', 'syslog' or a file name."
- },
- "includeSource": {
- "type": "boolean",
- "description": "Include source file and line number in log messages."
- },
- "includeTimestamp": {
- "type": "boolean",
- "description": "Include timestamp in log messages."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.log",
- "description": "Configure logging for a particular module. You can use the `UPDATE` operation to change log settings while the router is running."
- },
- "vhostUserGroupSettings": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "allowAnonymousSender": {
- "type": "boolean",
- "description": "Whether this connection is allowed to create sending links if the sender does not provide a target address. By prohibiting anonymous senders, the router only needs to verify once, when the link is created, that the sender is permitted to send messages to the target address. The router does not need to verify each message that is sent on the link. A value of 'true' means that users may send messages to any address. Allowing anonymous senders can also decrease performance: if the sender does not specify a target address, then the router must parse each message to determine how to route it."
- },
- "maxReceivers": {
- "default": 2147483647,
- "type": "integer",
- "description": "The maximum number of receiving links that may be created on this connection. A value of '0' disables all receiver links."
- },
- "users": {
- "required": true,
- "type": "string",
- "description": "A list of authenticated users for this user group. Use commas to separate multiple users. A user may belong to only one vhost user group."
- },
- "maxSessions": {
- "default": 32768,
- "type": "integer",
- "description": "The maximum number of sessions that may be created on this connection. Non-zero policy values overwrite values specified for a listener object (AMQP Open, channel-max)."
- },
- "maxSessionWindow": {
- "default": 1638400,
- "type": "integer",
- "description": "The incoming capacity for new AMQP sessions, measured in octets. Non-zero policy values overwrite values specified for a listener object (AMQP Begin, incoming-window)."
- },
- "allowDynamicSource": {
- "type": "boolean",
- "description": "Whether this connection is allowed to create dynamic receiving links (links to resources that do not exist on the peer). A value of 'true' means that users are able to automatically create resources on the peer system."
- },
- "maxFrameSize": {
- "default": 16384,
- "type": "integer",
- "description": "The largest frame, in bytes, that may be sent on this connection. Non-zero policy values overwrite values specified for a listener object (AMQP Open, max-frame-size)."
- },
- "sources": {
- "type": "string",
- "description": "A list of source addresses from which users in this group may receive messages. To specify multiple addresses, separate the addresses with either a comma or a space. If you do not specify any addresses, users in this group are not allowed to receive messages from any addresses. You can use the substitution token '{user}' to specify an address that contains a user's authenticated user name. You can use an asterisk ('*') wildcard to match one or more characters in an address. However, this wildcard is only recognized if it is the last character in the address name."
- },
- "allowUserIdProxy": {
- "type": "boolean",
- "description": "Whether this connection is allowed to send messages with a user ID that is different than the connection's authenticated user name."
- },
- "remoteHosts": {
- "required": true,
- "type": "string",
- "description": "A list of remote hosts from which the users may connect. A host can be a hostname, IP address, or IP address range. Use commas to separate multiple hosts. To allow access from all remote hosts, specify a wildcard '*'. To deny access from all remote hosts, leave this attribute blank."
- },
- "maxSenders": {
- "default": 2147483647,
- "type": "integer",
- "description": "The maximum number of sending links that may be created on this connection. A value of '0' disables all sender links."
- },
- "targets": {
- "type": "string",
- "description": "A list of target addresses from which users in this group may send messages. To specify multiple addresses, separate the addresses with either a comma or a space. If you do not specify any addresses, users in this group are not allowed to send messages from any addresses. You can use the substitution token '{user}' to specify an address that contains a user's authenticated user name. You can use an asterisk ('*') wildcard to match one or more characters in an address. However, this wildcard is only recognized if it is the last character in the address name."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.vhostUserGroupSettings",
- "description": "Policy settings for users connecting to a vhost. Configuration files including this section must use .json format."
- },
- "vhostStats": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "perHostState": {
- "type": "map",
- "description": "A map where the key is the host name and the value is a list of the host's connections."
- },
- "hostname": {
- "type": "string",
- "description": "The vhost name."
- },
- "id": {
- "type": "string",
- "description": "The vhost name. DEPRECATED - use 'hostname' instead."
- },
- "perUserState": {
- "type": "map",
- "description": "A map where the key is the authenticated user name and the value is a list of the user's connections."
- },
- "sessionDenied": {
- "graph": true,
- "type": "integer"
- },
- "connectionsApproved": {
- "graph": true,
- "type": "integer"
- },
- "receiverDenied": {
- "graph": true,
- "type": "integer"
- },
- "connectionsCurrent": {
- "graph": true,
- "type": "integer"
- },
- "connectionsDenied": {
- "graph": true,
- "type": "integer"
- },
- "senderDenied": {
- "graph": true,
- "type": "integer"
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.vhostStats",
- "description": "Virtual host connection and access statistics."
- },
- "connector": {
- "operations": [
- "CREATE",
- "DELETE",
- "READ"
- ],
- "attributes": {
- "maxSessionFrames": {
- "type": "integer",
- "description": "Session incoming window measured in transfer frames for sessions created on this connection. This is the number of transfer frames that may simultaneously be in flight for all links in the session. Setting this value to zero selects the default session window size. Policy settings will not overwrite this value. The numerical product of maxFrameSize and maxSessionFrames may not exceed 2^31-1. If (maxFrameSize x maxSessionFrames) exceeds 2^31-1 then maxSessionFrames is reduced to (2^31-1 / maxFrameSize). maxSessionFrames has a minimum value of 1. Defaults to 0 (unlimited window)."
- },
- "verifyHostname": {
- "default": true,
- "type": "boolean",
- "description": "yes: Ensures that when initiating a connection (as a client) the host name in the URL to which this connector connects to matches the host name in the digital certificate that the peer sends back as part of the SSL connection; no: Does not perform host name verification"
- },
- "saslPassword": {
- "type": "string",
- "description": "The password that the connector is using to connect to a peer."
- },
- "stripAnnotations": {
- "default": "both",
- "type": [
- "in",
- "out",
- "both",
- "no"
- ],
- "description": "['in', 'out', 'both', 'no'] in: Strip the dispatch router specific annotations only on ingress; out: Strip the dispatch router specific annotations only on egress; both: Strip the dispatch router specific annotations on both ingress and egress; no - do not strip dispatch router specific annotations"
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "saslUsername": {
- "type": "string",
- "description": "The user name that the connector is using to connect to a peer."
- },
- "allowRedirect": {
- "default": true,
- "type": "boolean",
- "description": "Allow the peer to redirect this connection to another address."
- },
- "idleTimeoutSeconds": {
- "default": 16,
- "type": "integer",
- "description": "The idle timeout, in seconds, for connections through this connector. If no frames are received on the connection for this time interval, the connection shall be closed."
- },
- "saslMechanisms": {
- "type": "string",
- "description": "Space separated list of accepted SASL authentication mechanisms."
- },
- "maxFrameSize": {
- "default": 16384,
- "type": "integer",
- "description": "The maximum frame size in octets that will be used in the connection-open negotiation with a connected peer. The frame size is the largest contiguous set of uninterrupted data that can be sent for a message delivery over the connection. Interleaving of messages on different links is done at frame granularity. Policy settings will not overwrite this value. Defaults to 16384."
- },
- "port": {
- "default": "amqp",
- "type": "string",
- "description": "Port number or symbolic service name."
- },
- "linkCapacity": {
- "type": "integer",
- "description": "The capacity of links within this connection, in terms of message deliveries. The capacity is the number of messages that can be in-flight concurrently for each link."
- },
- "host": {
- "default": "127.0.0.1",
- "type": "string",
- "description": "IP address: ipv4 or ipv6 literal or a host name"
- },
- "cost": {
- "default": 1,
- "type": "integer",
- "description": "For the 'inter-router' role only. This value assigns a cost metric to the inter-router connection. The default (and minimum) value is one. Higher values represent higher costs. The cost is used to influence the routing algorithm as it attempts to use the path with the lowest total cost from ingress to egress."
- },
- "role": {
- "default": "normal",
- "type": [
- "normal",
- "inter-router",
- "route-container"
- ],
- "description": "The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection. In the inter-router role, the connection is assumed to be to another router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection."
- },
- "sslProfile": {
- "type": "string",
- "description": "Name of the sslProfile."
- },
- "failoverUrls": {
- "type": "string",
- "description": "A read-only, comma-separated list of failover urls. "
- },
- "maxSessions": {
- "default": 32768,
- "type": "integer",
- "description": "The maximum number of sessions that can be simultaneously active on the connection. Setting this value to zero selects the default number of sessions. Policy settings will not overwrite this value. Defaults to 32768."
- },
- "protocolFamily": {
- "type": [
- "IPv4",
- "IPv6"
- ],
- "description": "['IPv4', 'IPv6'] IPv4: Internet Protocol version 4; IPv6: Internet Protocol version 6. If not specified, the protocol family will be automatically determined from the address."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "messageLoggingComponents": {
- "default": "none",
- "type": "string",
- "description": "A comma separated list that indicates which components of the message should be logged (no spaces allowed between list components). Defaults to 'none' (log nothing). If you want all properties and application properties of the message logged use 'all'. Specific components of the message can be logged by indicating the components via a comma separated list. The components are message-id, user-id, to, subject, reply-to, correlation-id, content-type, content-encoding, absolute-expiry-time, creation-time, group-id, group-sequence, reply-to-group-id, app-properties. The application-data part of the bare message will not be logged. This log message is written to the MESSAGE logging module. In the 'log' entity, set 'module' property to MESSAGE or DEFAULT and 'enable' to trace+ to see this log message"
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.connector",
- "description": "Establishes an outgoing connection from the router."
- },
- "logStats": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "debugCount": {
- "graph": true,
- "type": "integer",
- "description": "How many debug-level events have happened on this log."
- },
- "criticalCount": {
- "graph": true,
- "type": "integer",
- "description": "How many critical-level events have happened on this log."
- },
- "traceCount": {
- "graph": true,
- "type": "integer",
- "description": "How many trace-level events have happened on this log."
- },
- "warningCount": {
- "graph": true,
- "type": "integer",
- "description": "How many warning-level events have happened on this log."
- },
- "infoCount": {
- "graph": true,
- "type": "integer",
- "description": "How many info-level events have happened on this log."
- },
- "noticeCount": {
- "graph": true,
- "type": "integer",
- "description": "How many notice-level events have happened on this log."
- },
- "errorCount": {
- "graph": true,
- "type": "integer",
- "description": "How many error-level events have happened on this log."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.logStats",
- "description": "histogram of the different severity-levels of events on the given log."
- },
- "allocator": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "heldByThreads": {
- "graph": true,
- "type": "integer"
- },
- "localFreeListMax": {
- "graph": true,
- "type": "integer"
- },
- "transferBatchSize": {
- "type": "integer"
- },
- "globalFreeListMax": {
- "graph": true,
- "type": "integer"
- },
- "batchesRebalancedToGlobal": {
- "graph": true,
- "type": "integer"
- },
- "typeName": {
- "type": "string"
- },
- "batchesRebalancedToThreads": {
- "graph": true,
- "type": "integer"
- },
- "totalFreeToHeap": {
- "graph": true,
- "type": "integer"
- },
- "totalAllocFromHeap": {
- "graph": true,
- "type": "integer"
- },
- "typeSize": {
- "type": "integer"
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.allocator",
- "description": "Memory allocation pool."
- },
- "policy": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "connectionsProcessed": {
- "graph": true,
- "type": "integer"
- },
- "policyDir": {
- "type": "path",
- "description": "The absolute path to a directory that holds vhost policy definition files in JSON format (*.json). The router processes all of the vhost policies in each JSON file that is in this directory."
- },
- "defaultVhost": {
- "default": "$default",
- "type": "string",
- "description": "The name of the default vhost policy, which is applied to any connection for which a vhost policy has not been configured. If 'defaultVhost' is not defined, then default vhost processing is disabled."
- },
- "connectionsDenied": {
- "graph": true,
- "type": "integer"
- },
- "enableVhostPolicy": {
- "type": "boolean",
- "description": "Enables the router to enforce the connection denials and resource limits defined in the configured vhost policies."
- },
- "maxConnections": {
- "default": 65535,
- "type": "integer",
- "description": "The maximum number of concurrent client connections allowed for this router. This limit is always enforced, even if no other policy settings have been defined. The limit is applied to all incoming connections regardless of remote host, authenticated user, or targeted vhost."
- },
- "connectionsCurrent": {
- "graph": true,
- "type": "integer"
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- }
- },
- "singleton": true,
- "fullyQualifiedType": "org.apache.qpid.dispatch.policy",
- "description": "Defines global connection limit"
- },
- "autoLink": {
- "operations": [
- "CREATE",
- "DELETE",
- "READ"
- ],
- "attributes": {
- "direction": {
- "required": true,
- "type": [
- "in",
- "out"
- ],
- "description": "The direction of the link to be created. In means into the router, out means out of the router."
- },
- "addr": {
- "required": true,
- "type": "string",
- "description": "The address of the provisioned object"
- },
- "linkRef": {
- "type": "string",
- "description": "Reference to the org.apache.qpid.dispatch.router.link if the link exists"
- },
- "containerId": {
- "type": "string",
- "description": "ContainerID for the target container. Only one of containerId or connection should be specified for an autoLink. Specifying both will result in the autoLink not being created"
- },
- "operStatus": {
- "type": [
- "inactive",
- "attaching",
- "failed",
- "active",
- "quiescing",
- "idle"
- ],
- "description": "The operational status of this autoLink: inactive - The remote container is not connected; attaching - the link is attaching to the remote node; failed - the link attach failed; active - the link is attached and operational; quiescing - the link is transitioning to idle state; idle - the link is attached but there are no deliveries flowing and no unsettled deliveries."
- },
- "connection": {
- "type": "string",
- "description": "The name from a connector or listener. Only one of containerId or connection should be specified for an autoLink. Specifying both will result in the autoLink not being created"
- },
- "phase": {
- "type": "integer",
- "description": "The address phase for this link. Defaults to '0' for 'out' links and '1' for 'in' links."
- },
- "lastError": {
- "type": "string",
- "description": "The error description from the last attach failure"
- },
- "externalAddr": {
- "type": "string",
- "description": "If present, an alternate address of the node on the remote container. This is used if the node has a different address than the address used internally by the router to route deliveries."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.router.config.autoLink",
- "description": "Entity type for configuring auto-links. Auto-links are links whose lifecycle is managed by the router. These are typically used to attach to waypoints on remote containers (brokers, etc.)."
- },
- "listener": {
- "operations": [
- "CREATE",
- "DELETE",
- "READ"
- ],
- "attributes": {
- "stripAnnotations": {
- "default": "both",
- "type": [
- "in",
- "out",
- "both",
- "no"
- ],
- "description": "['in', 'out', 'both', 'no'] in: Strip the dispatch router specific annotations only on ingress; out: Strip the dispatch router specific annotations only on egress; both: Strip the dispatch router specific annotations on both ingress and egress; no - do not strip dispatch router specific annotations"
- },
- "requireSsl": {
- "type": "boolean",
- "description": "yes: Require the use of SSL or TLS on the connection; no: Allow clients to connect without SSL or TLS."
- },
- "messageLoggingComponents": {
- "default": "none",
- "type": "string",
- "description": "A comma separated list that indicates which components of the message should be logged. Defaults to 'none' (log nothing). If you want all properties and application properties of the message logged use 'all'. Specific components of the message can be logged by indicating the components via a comma separated list. The components are message-id, user-id, to, subject, reply-to, correlation-id, content-type, content-encoding, absolute-expiry-time, creation-time, group-id, group-sequence, reply-to-group-id, app-properties. The application-data part of the bare message will not be logged. No spaces are allowed"
- },
- "maxSessionFrames": {
- "type": "integer",
- "description": "Session incoming window measured in transfer frames for sessions created on this connection. This is the number of transfer frames that may simultaneously be in flight for all links in the session. Setting this value to zero selects the default session window size. Policy settings, if specified, will overwrite this value. The numerical product of maxFrameSize and maxSessionFrames may not exceed 2^31-1. If (maxFrameSize x maxSessionFrames) exceeds 2^31-1 then maxSessionFrames is reduced to (2^31-1 / maxFrameSize). maxSessionFrames has a minimum value of 1. Defaults to 0 (unlimited window)."
- },
- "cost": {
- "default": 1,
- "type": "integer",
- "description": "For the 'inter-router' role only. This value assigns a cost metric to the inter-router connection. The default (and minimum) value is one. Higher values represent higher costs. The cost is used to influence the routing algorithm as it attempts to use the path with the lowest total cost from ingress to egress."
- },
- "port": {
- "default": "amqp",
- "type": "string",
- "description": "Port number or symbolic service name. If '0', the router shall assign an ephemeral port to the listener and log the port number with a log of the form 'SERVER (notice) Listening on <host>:<assigned-port> (<listener-name>)'"
- },
- "saslPlugin": {
- "type": "string",
- "description": "EXPERIMENTAL. Name of the a sasl plugin configuration section to use for this listener (e.g. authServicePlugin)."
- },
- "trustedCertsFile": {
- "type": "path",
- "description": "This optional setting can be used to reduce the set of available CAs for client authentication. If used, this setting must provide the absolute path to a PEM file that contains the trusted certificates."
- },
- "saslMechanisms": {
- "type": "string",
- "description": "Space separated list of accepted SASL authentication mechanisms."
- },
- "requireEncryption": {
- "type": "boolean",
- "description": "yes: Require the connection to the peer to be encrypted; no: Permit non-encrypted communication with the peer"
- },
- "linkCapacity": {
- "type": "integer",
- "description": "The capacity of links within this connection, in terms of message deliveries. The capacity is the number of messages that can be in-flight concurrently for each link."
- },
- "role": {
- "default": "normal",
- "type": [
- "normal",
- "inter-router",
- "route-container"
- ],
- "description": "The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection. In the inter-router role, the connection is assumed to be to another router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "maxSessions": {
- "default": 32768,
- "type": "integer",
- "description": "The maximum number of sessions that can be simultaneously active on the connection. Setting this value to zero selects the default number of sessions. Policy settings, if specified, will overwrite this value. Defaults to 32768."
- },
- "authenticatePeer": {
- "type": "boolean",
- "description": "yes: Require the peer's identity to be authenticated; no: Do not require any authentication."
- },
- "http": {
- "type": "boolean",
- "description": "Accept HTTP connections that can upgrade to AMQP over WebSocket. Plain AMQP connections are not accepted on this listener."
- },
- "idleTimeoutSeconds": {
- "default": 16,
- "type": "integer",
- "description": "The idle timeout, in seconds, for connections through this listener. If no frames are received on the connection for this time interval, the connection shall be closed."
- },
- "multiTenant": {
- "type": "boolean",
- "description": "If true, apply multi-tenancy to endpoints connected at this listener. The address space is defined by the virtual host (hostname field in the Open)."
- },
- "host": {
- "type": "string",
- "description": "A host name, IPV4 or IPV6 literal, or the empty string. The empty string listens on all local addresses. A host name listens on all addresses associated with the name. An IPV6 literal address (or wildcard '[::]') listens only for IPV6. An IPV4 literal address (or wildcard '0.0.0.0') listens only for IPV4."
- },
- "initialHandshakeTimeoutSeconds": {
- "type": "integer",
- "description": "The timeout, in seconds, for the initial handshake for connections coming in through listeners. If the time interval expires before the peer sends the AMQP OPEN frame, the connection shall be closed. A value of zero (the default) disables this timeout."
- },
- "httpRootDir": {
- "type": "path",
- "description": "Serve HTTP files from this directory, defaults to the installed stand-alone console directory"
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "socketAddressFamily": {
- "type": [
- "IPv4",
- "IPv6"
- ],
- "description": "['IPv4', 'IPv6'] IPv4: Internet Protocol version 4; IPv6: Internet Protocol version 6. If not specified, the protocol family will be automatically determined from the address."
- },
- "maxFrameSize": {
- "default": 16384,
- "type": "integer",
- "description": "The maximum frame size in octets that will be used in the connection-open negotiation with a connected peer. The frame size is the largest contiguous set of uninterrupted data that can be sent for a message delivery over the connection. Interleaving of messages on different links is done at frame granularity. Policy settings, if specified, will overwrite this value. Defaults to 16384."
- },
- "sslProfile": {
- "type": "string",
- "description": "Name of the sslProfile."
- },
- "failoverUrls": {
- "type": "string",
- "description": "A comma-separated list of failover urls to be supplied to connected clients. Form: [(amqp|amqps|ws|wss)://]host_or_ip[:port]"
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.listener",
- "description": "Listens for incoming connections to the router."
- },
- "configurationEntity": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.configurationEntity",
- "description": "Base type for entities containing configuration information."
- },
- "routerStats": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "linkRouteCount": {
- "graph": true,
- "type": "integer",
- "description": "Number of link routes attached to the router node."
- },
- "droppedPresettledDeliveries": {
- "graph": true,
- "type": "integer",
- "description": "Number of presettled deliveries that were dropped by the router."
- },
- "rejectedDeliveries": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries whose delivery state was set to REJECTED by the router. These deliveries were Invalid and unprocessable."
- },
- "autoLinkCount": {
- "graph": true,
- "type": "integer",
- "description": "Number of auto links attached to the router node."
- },
- "id": {
- "type": "string",
- "description": "Router's unique identity. The router will fail to start without id."
- },
- "presettledDeliveries": {
- "graph": true,
- "type": "integer",
- "description": "Number of presettled deliveries handled by the router."
- },
- "deliveriesIngress": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries that were sent to it by a sender that is directly attached to the router."
- },
- "deliveriesIngressRouteContainer": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries that were received from router container connections."
- },
- "acceptedDeliveries": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries whose delivery state was set to ACCEPTED by the router. These deliveries were successfully processed by the router."
- },
- "version": {
- "type": "string",
- "description": "Software Version"
- },
- "linkCount": {
- "graph": true,
- "type": "integer",
- "description": "Number of links attached to the router node."
- },
- "connectionCount": {
- "graph": true,
- "type": "integer",
- "description": "Number of open connections to the router node."
- },
- "addrCount": {
- "graph": true,
- "type": "integer",
- "description": "Number of addresses known to the router."
- },
- "releasedDeliveries": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries whose delivery state was set to RELEASED by the router. These deliveries was not (and will not be) processed"
- },
- "nodeCount": {
- "graph": true,
- "type": "integer",
- "description": "Number of known peer router nodes."
- },
- "modifiedDeliveries": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries whose delivery state was set to MODIFIED by the router. These deliveries were modified but not processed."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "deliveriesEgress": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries that were sent by the router to a receiver that is directly attached to the router."
- },
- "deliveriesEgressRouteContainer": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries that were sent to route container connections."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "deliveriesTransit": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries that were sent to another router in the network."
- },
- "mode": {
- "default": "standalone",
- "type": [
- "standalone",
- "interior"
- ],
- "description": "In standalone mode, the router operates as a single component. It does not participate in the routing protocol and therefore will not cooperate with other routers. In interior mode, the router operates in cooperation with other interior routers in an interconnected network."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.routerStats",
- "description": "Overall router statistics."
- },
- "authServicePlugin": {
- "operations": [
- "CREATE",
- "DELETE",
- "READ"
- ],
- "attributes": {
- "saslInitHostname": {
- "type": "string",
- "description": "Value to set for hostname field on sasl-init"
- },
- "authSslProfile": {
- "type": "string",
- "description": "Name of the sslProfile to use for the authentication service."
- },
- "authService": {
- "required": true,
- "type": "string",
- "description": "Address of a service to delegate authentication to."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.authServicePlugin",
- "description": "EXPERIMENTAL. Attributes for setting SASL plugin."
- },
- "router.node": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "routerLink": {
- "type": "entityId",
- "description": "Local link to remote node"
- },
- "nextHop": {
- "type": "string",
- "description": "Neighbour ID of next hop to remote node from here."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "index": {
- "type": "integer",
- "description": "Index number used in statistics histograms for this router node. This index is specific to this router."
- },
- "validOrigins": {
- "type": "list",
- "description": "List of valid origin nodes for messages arriving via the re mote node, used for duplicate elimination in redundant networks."
- },
- "linkState": {
- "type": "list",
- "description": "List of remote node's neighbours."
- },
- "instance": {
- "type": "integer",
- "description": "Remote node boot number."
- },
- "cost": {
- "type": "integer",
- "description": "Reachability cost"
- },
- "protocolVersion": {
- "type": "integer",
- "description": "Router-protocol version supported by the node."
- },
- "address": {
- "type": "string",
- "description": "Address of the remote node"
- },
- "lastTopoChange": {
- "type": "integer",
- "description": "Timestamp showing the most recent change to this node's neighborhood."
- },
- "id": {
- "type": "string",
- "description": "Remote node identifier."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.router.node",
- "description": "Remote router node connected to this router."
- },
- "dummy": {
- "operations": [
- "CREATE",
- "READ",
- "UPDATE",
- "DELETE",
- "CALLME"
- ],
- "attributes": {
- "num1": {
- "type": "integer"
- },
- "num2": {
- "type": "integer"
- },
- "arg1": {
- "type": "string"
- },
- "arg2": {
- "type": "string"
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.dummy",
- "description": "Dummy entity for test purposes."
- },
- "router.address": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "subscriberCount": {
- "graph": true,
- "type": "integer",
- "description": "The number of local subscribers for this address (i.e. attached to this router)"
- },
- "deliveriesEgress": {
- "graph": true,
- "type": "integer",
- "description": "The number of deliveries to this address that exited the router network on this router"
- },
- "deliveriesEgressRouteContainer": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries that were sent to a route-container address."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "deliveriesIngress": {
- "graph": true,
- "type": "integer",
- "description": "The number of deliveries to this address that entered the router network on this router"
- },
- "transitOutstanding": {
- "type": "list",
- "description": "List of numbers of outstanding deliveries across a transit (inter-router) link for this address. This is for balanced distribution only."
- },
- "deliveriesIngressRouteContainer": {
- "graph": true,
- "type": "integer",
- "description": "Number of deliveries that were received from a route-container address."
- },
- "remoteCount": {
- "graph": true,
- "type": "integer",
- "description": "The number of remote routers that have at least one subscriber to this address"
- },
- "inProcess": {
- "type": "integer",
- "description": "The number of in-process subscribers for this address"
- },
- "deliveriesFromContainer": {
- "graph": true,
- "type": "integer",
- "description": "The number of deliveries to this address that were originated from an in-process entity"
- },
- "deliveriesTransit": {
- "graph": true,
- "type": "integer",
- "description": "The number of deliveries to this address that transited this router to another router"
- },
- "containerCount": {
- "graph": true,
- "type": "integer",
- "description": "The number of attached containers that serve this route address"
- },
- "key": {
- "type": "string",
- "description": "Internal unique (to this router) key to identify the address"
- },
- "distribution": {
- "type": [
- "flood",
- "multicast",
- "closest",
- "balanced",
- "linkBalanced",
- "unavailable"
- ],
- "description": "Forwarding treatment for the address: flood - messages delivered to all subscribers along all available paths (this will cause duplicate deliveries if there are redundant paths); multicast - one copy of each message delivered to all subscribers; closest - messages delivered to only the closest subscriber; balanced - messages delivered to one subscriber with load balanced across subscribers; linkBalanced - for link-routing, link attaches balanced across destinations; unavailable - this address is unavailable, link attaches to an address of unavailable distribution will be rejected."
- },
- "trackedDeliveries": {
- "type": "integer",
- "description": "Number of transit deliveries being tracked for this address (for balanced distribution)."
- },
- "deliveriesToContainer": {
- "graph": true,
- "type": "integer",
- "description": "The number of deliveries to this address that were given to an in-process subscriber"
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "remoteHostRouters": {
- "type": "list",
- "description": "List of remote routers on which there is a destination for this address."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.router.address",
- "description": "AMQP address managed by the router."
- },
- "router.link": {
- "operations": [
- "UPDATE",
- "READ"
- ],
- "attributes": {
- "adminStatus": {
- "default": "enabled",
- "type": [
- "enabled",
- "disabled"
- ]
- },
- "linkType": {
- "type": [
- "endpoint",
- "router-control",
- "inter-router"
- ],
- "description": "Type of link: endpoint: a link to a normally connected endpoint; inter-router: a link to another router in the network."
- },
- "releasedCount": {
- "graph": true,
- "type": "integer",
- "description": "The total number of released deliveries."
- },
- "capacity": {
- "type": "integer",
- "description": "The capacity, in deliveries, for the link. The number of undelivered plus unsettled deliveries shall not exceed the capacity. This is enforced by link flow control."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "operStatus": {
- "type": [
- "up",
- "down",
- "quiescing",
- "idle"
- ]
- },
- "linkDir": {
- "type": [
- "in",
- "out"
- ],
- "description": "Direction of delivery flow over the link, inbound or outbound to or from the router."
- },
- "unsettledCount": {
- "graph": true,
- "type": "integer",
- "description": "The number of unsettled deliveries awaiting settlement on the link"
- },
- "deliveryCount": {
- "graph": true,
- "type": "integer",
- "description": "The total number of deliveries that have traversed this link."
- },
- "ingressHistogram": {
- "type": "list",
- "description": "For outgoing links on connections with 'normal' role. This histogram shows the number of settled deliveries on the link that ingressed the network at each interior router node."
- },
- "droppedPresettledCount": {
- "graph": true,
- "type": "integer",
- "description": "The total number of pre-settled deliveries that were dropped."
- },
- "peer": {
- "type": "string",
- "description": "Identifier of the paired link if this is an attach-routed link."
- },
- "owningAddr": {
- "type": "string",
- "description": "Address assigned to this link during attach: The target for inbound links or the source for outbound links."
- },
- "rejectedCount": {
- "graph": true,
- "type": "integer",
- "description": "The total number of rejected deliveries."
- },
- "undeliveredCount": {
- "graph": true,
- "type": "integer",
- "description": "The number of undelivered messages pending for the link."
- },
- "linkName": {
- "type": "string",
- "description": "Name assigned to the link in the Attach."
- },
- "presettledCount": {
- "graph": true,
- "type": "integer",
- "description": "The total number of pre-settled deliveries."
- },
- "acceptedCount": {
- "graph": true,
- "type": "integer",
- "description": "The total number of accepted deliveries."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "modifiedCount": {
- "graph": true,
- "type": "integer",
- "description": "The total number of modified deliveries."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.router.link",
- "description": "Link to another AMQP endpoint: router node, client or other AMQP process."
- },
- "org.amqp.management": {
- "operations": [
- "QUERY",
- "GET-TYPES",
- "GET-ANNOTATIONS",
- "GET-OPERATIONS",
- "GET-ATTRIBUTES",
- "GET-MGMT-NODES",
- "READ"
- ],
- "attributes": {
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.org.amqp.management",
- "description": "The standard AMQP management node interface."
- },
- "operationalEntity": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.operationalEntity",
- "description": "Base type for entities containing current operational information."
- },
- "connection": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "container": {
- "type": "string",
- "description": "The container for this connection"
- },
- "opened": {
- "type": "boolean",
- "description": "The connection has been opened (i.e. AMQP OPEN)"
- },
- "sslCipher": {
- "type": "string",
- "description": "SSL cipher name"
- },
- "user": {
- "type": "string",
- "description": "Identity of the authenticated user."
- },
- "sslProto": {
- "type": "string",
- "description": "SSL protocol name"
- },
- "dir": {
- "type": [
- "in",
- "out"
- ],
- "description": "Direction of connection establishment in or out of the router."
- },
- "ssl": {
- "type": "boolean",
- "description": "True iff SSL/TLS is in effect for this connection."
- },
- "host": {
- "type": "string",
- "description": "IP address and port number in the form addr:port."
- },
- "isEncrypted": {
- "type": "boolean",
- "description": "Indicates whether the connection content is encrypted."
- },
- "role": {
- "type": "string"
- },
- "isAuthenticated": {
- "type": "boolean",
- "description": "Indicates whether the identity of the connection's user is authentic."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "sasl": {
- "type": "string",
- "description": "SASL mechanism in effect for authentication."
- },
- "sslSsf": {
- "type": "integer",
- "description": "SSL strength factor in effect"
- },
- "properties": {
- "type": "map",
- "description": "Connection properties supplied by the peer."
- },
- "tenant": {
- "type": "string",
- "description": "If multi-tenancy is on for this connection, the tenant space in effect"
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.connection",
- "description": "Connections to the router's container."
- },
- "router": {
- "operations": [
- "READ"
- ],
- "attributes": {
- "debugDumpFile": {
- "type": "path",
- "description": "The absolute path to the location for the debug dump file. The router writes debug-level information to this file if the logger is not available."
- },
- "hostName": {
- "type": "string",
- "description": "hostName of machine on which router is running"
- },
- "workerThreads": {
- "default": 4,
- "type": "integer",
- "description": "The number of threads that will be created to process message traffic and other application work (timers, non-amqp file descriptors, etc.) ."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- },
- "raIntervalSeconds": {
- "default": 30,
- "type": "integer",
- "description": "Interval in seconds between Router-Advertisements sent to all routers in a stable network."
- },
- "area": {
- "type": "string",
- "description": "Unused placeholder."
- },
- "raIntervalFluxSeconds": {
- "default": 4,
- "type": "integer",
- "description": "Interval in seconds between Router-Advertisements sent to all routers during topology fluctuations."
- },
- "allowResumableLinkRoute": {
- "default": true,
- "type": "boolean",
- "description": "Whether links can be routed where timeout is non-zero or expiry-policy is not link-detach"
- },
- "helloIntervalSeconds": {
- "default": 1,
- "type": "integer",
- "description": "Interval in seconds between HELLO messages sent to neighbor routers."
- },
- "helloMaxAgeSeconds": {
- "default": 3,
- "type": "integer",
- "description": "Time in seconds after which a neighbor is declared lost if no HELLO is received."
- },
- "saslConfigDir": {
- "type": "path",
- "description": "Absolute path to the SASL configuration file."
- },
- "defaultDistribution": {
- "default": "balanced",
- "type": [
- "multicast",
- "closest",
- "balanced",
- "unavailable"
- ],
- "description": "Default forwarding treatment for any address without a specified treatment. multicast - one copy of each message delivered to all subscribers; closest - messages delivered to only the closest subscriber; balanced - messages delivered to one subscriber with load balanced across subscribers; unavailable - this address is unavailable, link attaches to an address of unavilable distribution will be rejected."
- },
- "version": {
- "type": "string",
- "description": "Software Version"
- },
- "remoteLsMaxAgeSeconds": {
- "default": 60,
- "type": "integer",
- "description": "Time in seconds after which link state is declared stale if no RA is received."
- },
- "mode": {
- "default": "standalone",
- "type": [
- "standalone",
- "interior"
- ],
- "description": "In standalone mode, the router operates as a single component. It does not participate in the routing protocol and therefore will not cooperate with other routers. In interior mode, the router operates in cooperation with other interior routers in an interconnected network."
- },
- "allowUnsettledMulticast": {
- "type": "boolean",
- "description": "If true, allow senders to send unsettled deliveries to multicast addresses. These deliveries shall be settled by the ingress router. If false, unsettled deliveries to multicast addresses shall be rejected."
- },
- "saslConfigName": {
- "default": "qdrouterd",
- "type": "string",
- "description": "Name of the SASL configuration. This string + '.conf' is the name of the configuration file."
- },
- "id": {
- "type": "string",
- "description": "Router's unique identity. The router will fail to start without id."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- }
- },
- "singleton": true,
- "fullyQualifiedType": "org.apache.qpid.dispatch.router",
- "description": "Tracks peer routers and computes routes to destinations. This entity is mandatory. The router will not start without this entity."
- },
- "vhost": {
- "operations": [
- "CREATE",
- "UPDATE",
- "DELETE",
- "READ"
- ],
- "attributes": {
- "allowUnknownUser": {
- "type": "boolean",
- "description": "Whether unknown users (users who are not members of a defined user group) are allowed to connect to the vhost. Unknown users are assigned to the '$default' user group and receive '$default' settings."
- },
- "maxConnectionsPerUser": {
- "default": 65535,
- "type": "integer",
- "description": "The maximum number of concurrent client connections allowed for any user."
- },
- "hostname": {
- "required": true,
- "type": "string",
- "description": "The hostname of the vhost. This vhost policy will be applied to any client connection that is directed to this hostname."
- },
- "groups": {
- "type": "map",
- "description": "A map where each key is a vhost name and each value is a map of the settings for users of that vhost."
- },
- "maxConnections": {
- "default": 65535,
- "type": "integer",
- "description": "The global maximum number of concurrent client connections allowed for this vhost."
- },
- "maxConnectionsPerHost": {
- "default": 65535,
- "type": "integer",
- "description": "The maximum number of concurrent client connections allowed for any remote host (the host from which the client is connecting)."
- },
- "identity": {
- "unique": true,
- "type": "string",
- "description": "Unique identity generated by the system. Will not change."
- },
- "name": {
- "unique": true,
- "type": "string",
- "description": "Unique name optionally assigned by user. Can be changed."
- }
- },
- "fullyQualifiedType": "org.apache.qpid.dispatch.vhost",
- "description": "AMQP virtual host policy definition of users, user groups, allowed remote hosts, and AMQP restrictions."
- }
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/5] qpid-dispatch git commit: DISPATCH-989 Removing this testing
tool
Posted by ea...@apache.org.
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/js/qdrTopology.js
----------------------------------------------------------------------
diff --git a/console/test/js/qdrTopology.js b/console/test/js/qdrTopology.js
deleted file mode 100644
index 89ea7b3..0000000
--- a/console/test/js/qdrTopology.js
+++ /dev/null
@@ -1,2140 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-/**
- * @module QDR
- */
-var QDR = (function(QDR) {
-
- QDR.module.controller('QDR.TopologyFormController', function($scope, QDRService) {
-
- $scope.attributes = []
- var nameTemplate = '<div title="{{row.entity.description}}" class="ngCellText"><span>{{row.entity.attributeName}}</span></div>';
- var valueTemplate = '<div title="{{row.entity.attributeValue}}" class="ngCellText"><span>{{row.entity.attributeValue}}</span></div>';
- $scope.topoGridOptions = {
- data: 'attributes',
- enableColumnResize: false,
- multiSelect: false,
- columnDefs: [{
- field: 'attributeName',
- displayName: 'Attribute',
- cellTemplate: nameTemplate
- }, {
- field: 'attributeValue',
- displayName: 'Value',
- cellTemplate: valueTemplate
- }]
- };
- $scope.form = ''
- $scope.$on('showEntityForm', function(event, args) {
- var attributes = args.attributes;
- var entityTypes = QDRService.schema.entityTypes[args.entity].attributes;
- attributes.forEach(function(attr) {
- if (entityTypes[attr.attributeName] && entityTypes[attr.attributeName].description)
- attr.description = entityTypes[attr.attributeName].description
- })
- $scope.attributes = attributes;
- $scope.form = args.entity;
- })
- $scope.$on('showAddForm', function(event) {
- //$scope.form = 'add';
- })
- })
-
- /**
- * @method TopologyController
- *
- * Controller that handles the QDR topology page
- */
- QDR.module.controller("QDR.TopologyController", ['$scope', '$rootScope', 'QDRService', '$location', '$timeout', '$dialog',
- function($scope, $rootScope, QDRService, $location, $timeout, $dialog) {
-
- $scope.baseName = "R"
- $scope.clientAddress = "addr1"
- $scope.panelVisible = true // show/hide the panel on the left
- $scope.multiData = []
- $scope.selectedClient = [];
- $scope.quiesceState = {}
- var dontHide = false;
-
- $( document ).ready(function() {
-
- d3.select(".qdr-topology.pane.left")
- .style("left" , "-480px")
- d3.select(".panel-adjacent")
- .style("margin-left", "10px")
- return;
- var isPaneHidden = localStorage["topoPanel"];
- if (isPaneHidden) {
- $scope.panelVisible = false
- d3.select(".qdr-topology.pane.left")
- .style("left" , "-380px")
- d3.select(".panel-adjacent")
- .style("margin-left", "30px")
- }
- });
- $scope.hideLeftPane = function (duration) {
- localStorage["topoPanel"] = "hide"
- d3.select(".qdr-topology.pane.left")
- .transition().duration(300).ease("sin-in")
- .style("left" , "-380px")
-
- d3.select(".panel-adjacent")
- .transition().duration(300).ease("sin-in")
- .style("margin-left", "30px")
- .each("end", function () {
- resize()
- $timeout(function () {QDR.log.debug("done with transition. setting scope ");$scope.panelVisible = false})
- })
- }
- $scope.showLeftPane = function () {
- localStorage.removeItem("topoPanel");
- d3.select(".qdr-topology.pane.left")
- .transition().duration(300).ease("sin-out")
- .style("left" , "0px")
-
- d3.select(".panel-adjacent")
- .transition().duration(300).ease("sin-out")
- .style("margin-left", "430px")
- .each("end", function () {
- resize()
- $timeout(function () {QDR.log.debug("done with transition. setting scope ");$scope.panelVisible = true})
- })
- }
-
- $scope.Publish = function () {
- var props = {nodes: nodes, links: links, topology: $scope.mockTopologyDir}
- QDRService.sendMethod("amqp:///publish/", "", [], "PUBLISH", props, function (nodeName, entity, response, context) {
- QDR.log.debug("method response " + response)
- Core.notification('info', props.topology + " published");
- })
- }
-
- function sourceTarget(skey, tkey, stype, ttype) {
- stype = stype || "inter-router"
- ttype = ttype || "inter-router"
- var source = nodes.findIndex( function (n) {
- return (n.key === skey && n.nodeType === stype)
- })
- var target = nodes.findIndex ( function (n) {
- return (n.key === tkey && n.nodeType === ttype)
- })
- return {source: source, target: target}
- }
-
- $scope.Duplicate = function () {
- var nodeBase = maxNodeIndex()
- var maxx = 0
- var minx = width - radiusNormal
- nodes.forEach (function (n1) {
- if (n1.x > maxx)
- maxx = n1.x
- if (n1.x < minx)
- minx = n1.x
- })
- var curNodesLen = nodes.length
- var baseName
- var name
- for (var i=0; i<curNodesLen; ++i) {
- var x = maxx + radius*3 + nodes[i].x - minx
- var y = nodes[i].y
-
- if (nodes[i].nodeType !== "inter-router") {
- // this is a client
- // find the parent router node
- var ni = nodes.findIndex( function (n) {
- return n.nodeType === 'inter-router' && n.key === nodes[i].key
- })
-
- var parentOffset = i - ni
- baseName = nodes[i+curNodesLen-parentOffset].name
- var nameParts = nodes[i].name.split('.')
- name = baseName + "." + nameParts[nameParts.length-1]
- } else {
- baseName = genNewName()
- name = baseName
- }
-
- var id = "amqp:/_topo/0/" + baseName + "/$management";
- var node = aNode(id, name, nodes[i].nodeType, undefined, nodes.length, x, y, undefined, false)
- if (node.nodeType !== 'inter-router') {
- node.user = nodes[i].user
- node.isEncrypted = nodes[i].isEncrypted
- node.host = nodes[i].host
- node.connectionId = node.id
- node.cdir = nodes[i].cdir
- node.normals = []
- for (var n=0; n<nodes[i].normals.length; ++n) {
- var nameParts = nodes[i].normals[n].name.split('.')
- var normalName = baseName + "." + nameParts[nameParts.length-1]
- node.normals.push({name: normalName, addr: nodes[i].normals[n].addr})
- }
- }
- nodes.push(node);
- }
- var curLinksLen = links.length
- for (var i=0; i<curLinksLen; ++i) {
- var source = links[i].source.id + curNodesLen
- var target = links[i].target.id + curNodesLen
- var left = links[i].left
- var right = links[i].right
- var dir = "out"
- if (left && right)
- dir = "both"
- else if (left)
- dir = "in"
- var cls = links[i].cls
- var uid = source + "." + target
- getLink(source, target, dir, cls, uid)
- }
- force.nodes(nodes).links(links).start();
- restart();
- }
-
- $scope.Clear = function () {
- nodes = []
- links = []
- force.nodes(nodes).links(links).start();
- restart();
- }
-
- var fixIds = function (list) {
- list.forEach( function (l, i) {
- l.id = i
- })
- }
- var fixUids = function (list) {
- list.forEach( function (l, i) {
- l.uid = l.source.id + "." + l.target.id
- })
- }
-
- $scope.delNode = function () {
- var i = nodes.length
- while (i--) {
- if (nodes[i].name === $scope.contextNode.name) {
- if (selected_node && selected_node.name === nodes[i].name)
- selected_node = null
- nodes.splice(i, 1)
- }
- }
- fixIds(nodes)
-
- var i = links.length
- while (i--) {
- if (links[i].source.name === $scope.contextNode.name || links[i].target.name === $scope.contextNode.name) {
- links.splice(i, 1)
- }
- }
- fixUids(links)
-
- initGraph()
- initForce()
- restart();
- }
- $scope.$watch('mockTopologyDir', function(newVal, oldVal) {
- if (oldVal != newVal) {
- switchTopology(newVal)
- }
- })
-
- var switchTopology = function (topology) {
- var props = {topology: topology}
- QDRService.sendMethod("amqp:///switch/", "", [], "SWITCH", props, function (nodeName, entity, response, context) {
- QDRService.addUpdatedAction("afterSwitch", function () {
- QDRService.delUpdatedAction("afterSwitch")
- $timeout(setupInitialUpdate)
- })
- QDRService.topology.get()
-
-/*
- $scope.mockTopologyDir = response.topology
- nodes = response.nodes
- links = response.links
- initGraph()
- initForce()
- initLegend()
- restart()
-*/
- QDR.log.debug("method response " + response)
- Core.notification('info', "switched to " + props.topology);
- })
- }
-
- var port = 20000
- var connectionId = 1
- $scope.addToNode = function (type) {
- var id = $scope.contextNode.key
- var clients = nodes.filter ( function (node) {
- return node.nodeType !== 'inter-router' && node.routerId === $scope.contextNode.name
- })
- var clientLen = 0
- clients.forEach (function (client) {
- clientLen += client.normals.length
- })
- var dir = "out"
- if (type === 'sender')
- dir = "in"
- else if (type === 'console' || type === 'both')
- dir = "both"
- var siblings = nodes.filter( function (n) {
- var pass = n.nodeType !== "inter-router" && n.key === id && n.cdir === dir
- if (pass) {
- if ((type === 'console' && !n.properties.console_identifier) ||
- (type !== 'console' && n.properties.console_identifier))
- pass = false
- }
- return pass
- })
- var name = $scope.contextNode.name + "." + (clientLen + 1)
- if (!siblings.length) {
- var properties = type === 'console' ? {console_identifier: "Dispatch console"} : {}
- var node = aNode(id, name, "normal", undefined, nodes.length, $scope.contextNode.x, $scope.contextNode.y - radius - radiusNormal,
- $scope.contextNode.id, false, properties)
- node.user = "anonymous"
- node.isEncrypted = false
- node.host = "0.0.0.0:" + port
- node.connectionId = node.id
- node.cdir = dir
- node.normals = [{name: node.name, addr: $scope.clientAddress}]
- nodes.push(node)
-
- var uid = "connection/" + node.host + ":" + node.connectionId
- getLink($scope.contextNode.id, nodes.length-1, dir, "small", uid);
- ++port
- ++connectionId
- } else {
- siblings[0].normals.push({name: name, addr: $scope.clientAddress})
- //siblings[0].name = siblings[0].routerId + "." + siblings[0].id + "." + siblings[0].normals.length
- }
- force.nodes(nodes).links(links).start();
- initLegend()
- restart();
- }
-
- if (!QDRService.connected) {
- // we are not connected. we probably got here from a bookmark or manual page reload
- QDRService.redirectWhenConnected("topology");
- return;
- }
- // we are currently connected. setup a handler to get notified if we are ever disconnected
- QDRService.addDisconnectAction(function() {
- QDRService.redirectWhenConnected("topology");
- $scope.$apply();
- })
-
- var urlPrefix = $location.absUrl();
- urlPrefix = urlPrefix.split("#")[0]
- QDR.log.debug("started QDR.TopologyController with urlPrefix: " + urlPrefix);
-
- $scope.addingNode = {
- step: 0,
- hasLink: false,
- trigger: ''
- };
-
- $scope.cancel = function() {
- $scope.addingNode.step = 0;
- }
-
- var NewRouterName = "__NEW__";
- // mouse event vars
- var selected_node = null,
- selected_link = null,
- mousedown_link = null,
- mousedown_node = null,
- mouseover_node = null,
- mouseup_node = null,
- initial_mouse_down_position = null;
-
- $scope.schema = "Not connected";
-
- $scope.modes = [{
- title: 'Topology view',
- name: 'Diagram',
- right: false
- },
- /* {title: 'Add a new router node', name: 'Add Router', right: true} */
- ];
- $scope.mode = "Diagram";
- $scope.contextNode = null; // node that is associated with the current context menu
-
- $scope.isModeActive = function(name) {
- if ((name == 'Add Router' || name == 'Diagram') && $scope.addingNode.step > 0)
- return true;
- return ($scope.mode == name);
- }
- $scope.selectMode = function(name) {
- if (name == "Add Router") {
- name = 'Diagram';
- if ($scope.addingNode.step > 0) {
- $scope.addingNode.step = 0;
- } else {
- // start adding node mode
- $scope.addingNode.step = 1;
- }
- } else {
- $scope.addingNode.step = 0;
- }
-
- $scope.mode = name;
- }
- $scope.addAnotherNode = function () {
- // we are starting the add mode
- $scope.$broadcast('showAddForm')
-
- resetMouseVars();
- //selected_node = null;
- //selected_link = null;
- // add a new node
- var x = radiusNormal * 4;
- var y = x;;
- var offset = jQuery('#topology').offset();
- x = mouseX - offset.left + $(document).scrollLeft();
- y = mouseY - offset.top + $(document).scrollTop();;
- var name = genNewName()
- var nextId = nodes.length //maxNodeIndex() + 1
- //NewRouterName = genNewName();
- var id = "amqp:/_topo/0/" + name + "/$management";
- var node = aNode(id, name, "inter-router", undefined, nextId, x, y, undefined, false)
- node.host = "0.0.0.0:" + port
- ++port
- nodes.push(node);
-
- force.nodes(nodes).links(links).start();
- restart(false);
- }
-
- $scope.$watch(function() { return $scope.addingNode.step }, function(newValue, oldValue) {
- if (newValue == 0 && oldValue != 0) {
- // we are cancelling the add
-
- // find the New node
- nodes.every(function(n, i) {
- // for the placeholder node, the key will be __internal__
- if (QDRService.nameFromId(n.key) == '__internal__') {
- var newLinks = links.filter(function(e, i) {
- return e.source.id == n.id || e.target.id == n.id;
- })
- // newLinks is an array of links to remove
- newLinks.map(function(e) {
- links.splice(links.indexOf(e), 1);
- })
- // i is the index of the node to remove
- nodes.splice(i, 1);
- force.nodes(nodes).links(links).start();
- restart(false);
- return false; // stop looping
- }
- return true;
- })
- updateForm(Object.keys(QDRService.topology.nodeInfo())[0], 'router', 0);
-
- } else if (newValue > 0) {
- // we are starting the add mode
- $scope.$broadcast('showAddForm')
-
- resetMouseVars();
- selected_node = null;
- selected_link = null;
- // add a new node
- var id = "amqp:/_topo/0/__internal__/$management";
- var x = radiusNormal * 4;
- var y = x;;
- if (newValue > 1) { // add at current mouse position
- var offset = jQuery('#topology').offset();
- x = mouseX - offset.left + $(document).scrollLeft();
- y = mouseY - offset.top + $(document).scrollTop();;
- }
- QDRService.ensureAllEntities({entity: ".router"}, function () {
- QDR.log.debug("got response for all .routers")
- NewRouterName = genNewName();
- nodes.push(aNode(id, NewRouterName, "inter-router", undefined, nodes.length, x, y, undefined, true));
- force.nodes(nodes).links(links).start();
- restart(false);
- })
- }
- })
- $scope.isRight = function(mode) {
- return mode.right;
- }
-
- var maxNodeIndex = function () {
- var maxIndex = -1
- nodes.forEach( function (node) {
- if (node.nodeType === "inter-router") {
- if (node.id > maxIndex)
- maxIndex = node.id
- }
- })
- return maxIndex;
- }
-
- // for ng-grid that shows details for multiple consoles/clients
- // generate unique name for router and containerName
- var genNewName = function() {
- var newName = $scope.baseName + "."
- for (var i=0; i<nodes.length; ++i) {
- var found = nodes.some( function (n) {
- return n.name === newName + i
- })
- if (!found)
- return newName + i
- }
- return newName + nodes.length
- }
-
- $scope.settings = function () {
- doAddDialog($scope.baseName);
- };
- $scope.reverseLink = function() {
- if (!mousedown_link)
- return;
- var d = mousedown_link;
- var tmp = d.left;
- d.left = d.right;;
- d.right = tmp;
- restart(false);
- tick();
- }
- $scope.removeLink = function() {
- if (!mousedown_link)
- return;
- var d = mousedown_link;
- links.every(function(l, i) {
- if (l.source.id == d.source.id && l.target.id == d.target.id) {
- links.splice(i, 1);
- force.links(links).start();
- return false; // exit the 'every' loop
- }
- return true;
- });
- restart(false);
- tick();
- }
- var setNodesFixed = function (name, b) {
- nodes.some(function (n) {
- if (n.name === name) {
- n.fixed = b;
- return true;
- }
- })
- }
- $scope.setFixed = function(b) {
- if ($scope.contextNode) {
- $scope.contextNode.fixed = b;
- setNodesFixed($scope.contextNode.name, b)
- savePositions()
- }
- restart();
- }
- $scope.isFixed = function() {
- if (!$scope.contextNode)
- return false;
- return ($scope.contextNode.fixed & 0b1);
- }
-
- var mouseX, mouseY;
- // event handlers for popup context menu
- $(document).mousemove(function(e) {
- mouseX = e.clientX;
- mouseY = e.clientY;
- });
- $(document).mousemove();
- $(document).click(function(e) {
- $scope.contextNode = null;
- $(".contextMenu").fadeOut(200);
- });
-
- var radii = {
- 'inter-router': 25,
- 'normal': 15,
- 'on-demand': 15
- };
- var radius = 25;
- var radiusNormal = 15;
- var svg, lsvg;
- var force;
- var animate = false; // should the force graph organize itself when it is displayed
- var path, circle;
- var savedKeys = {};
- var dblckickPos = [0, 0];
- var width = 0;
- var height = 0;
-
- var getSizes = function() {
- var legendWidth = 143;
- var gap = 5;
- var width = $('#topology').width() - gap - legendWidth;
- var top = $('#topology').offset().top
- var tpformHeight = $('#topologyForm').height()
- var height = Math.max(window.innerHeight, tpformHeight + top) - top - gap;
- if (width < 10) {
- QDR.log.info("page width and height are abnormal w:" + width + " height:" + height)
- return [0, 0];
- }
- return [width, height]
- }
- var resize = function() {
- if (!svg)
- return;
- var sizes = getSizes();
- width = sizes[0]
- height = sizes[1]
- if (width > 0) {
- // set attrs and 'resume' force
- svg.attr('width', width);
- svg.attr('height', height);
- force.size(sizes).resume();
- }
- }
- window.addEventListener('resize', resize);
- var sizes = getSizes()
- width = sizes[0]
- height = sizes[1]
- if (width <= 0 || height <= 0)
- return
-
- // set up initial nodes and links
- // - nodes are known by 'id', not by index in array.
- // - selected edges are indicated on the node (as a bold red circle).
- // - links are always source < target; edge directions are set by 'left' and 'right'.
- var nodes = [];
- var links = [];
-
- var aNode = function(id, name, nodeType, nodeInfo, nodeIndex, x, y, resultIndex, fixed, properties) {
- for (var i=0; i<nodes.length; ++i) {
- if (nodes[i].name === name)
- return nodes[i]
- }
- properties = properties || {};
- var routerId = QDRService.nameFromId(id)
- return {
- key: id,
- name: name,
- nodeType: nodeType,
- properties: properties,
- routerId: routerId,
- x: x,
- y: y,
- id: nodeIndex,
- resultIndex: resultIndex,
- fixed: !!+fixed,
- cls: name == NewRouterName ? 'temp' : ''
- };
- };
-
-
- var initForm = function(attributes, results, entityType, formFields) {
-
- while (formFields.length > 0) {
- // remove all existing attributes
- formFields.pop();
- }
-
- for (var i = 0; i < attributes.length; ++i) {
- var name = attributes[i];
- var val = results[i];
- var desc = "";
- if (entityType.attributes[name])
- if (entityType.attributes[name].description)
- desc = entityType.attributes[name].description;
-
- formFields.push({
- 'attributeName': name,
- 'attributeValue': val,
- 'description': desc
- });
- }
- }
-
- var getLinkAddr = function (id, connection, onode) {
- var links = onode[".router.link"]
- if (!links) {
- return $scope.clientAddress
- }
- links.results.forEach( function (linkResult) {
- var link = QDRService.flatten(links.attributeNames, linkResult)
- if (link.linkType === "endpoint" && link.connectionId === connection.identity)
- return link.owningAddr
- })
- return $scope.clientAddress
- }
-
- var getLinkDir = function (id, connection, onode) {
- var links = onode[".router.link"]
- if (!links) {
- return "unknown"
- }
- var inCount = 0, outCount = 0
- links.results.forEach( function (linkResult) {
- var link = QDRService.flatten(links.attributeNames, linkResult)
- if (link.linkType === "endpoint" && link.connectionId === connection.identity)
- if (link.linkDir === "in")
- ++inCount
- else
- ++outCount
- })
- if (inCount > 0 && outCount > 0)
- return "both"
- if (inCount > 0)
- return "in"
- if (outCount > 0)
- return "out"
- return "unknown"
- }
-
- var savePositions = function () {
- nodes.forEach( function (d) {
- localStorage[d.name] = angular.toJson({
- x: Math.round(d.x),
- y: Math.round(d.y),
- fixed: d.fixed ? 1 : 0,
- });
- })
- }
-
- var initializeNodes = function (nodeInfo) {
- var nodeCount = Object.keys(nodeInfo).length
- var yInit = 50;
- nodes = []
- for (var id in nodeInfo) {
- var name = QDRService.nameFromId(id);
- // if we have any new nodes, animate the force graph to position them
- var position = angular.fromJson(localStorage[name]);
- if (!angular.isDefined(position)) {
- animate = true;
- position = {
- x: Math.round(width / 4 + ((width / 2) / nodeCount) * nodes.length),
- y: Math.round(height / 2 + Math.sin(nodes.length / (Math.PI*2.0)) * height / 4),
- fixed: false,
- };
- //QDR.log.debug("new node pos (" + position.x + ", " + position.y + ")")
- }
- if (position.y > height) {
- position.y = 200 - yInit;
- yInit *= -1
- }
- nodes.push(aNode(id, name, "inter-router", nodeInfo, nodes.length, position.x, position.y, undefined, position.fixed));
- //QDR.log.debug("adding node " + nodes.length-1);
- }
- }
-
- var initializeLinks = function (nodeInfo, unknowns) {
- links = [];
- var source = 0;
- var client = 1.0;
- for (var id in nodeInfo) {
- var onode = nodeInfo[id];
- var conns = onode['.connection'].results;
- var attrs = onode['.connection'].attributeNames;
- //QDR.log.debug("external client parent is " + parent);
- var normalsParent = {}; // 1st normal node for this parent
-
- for (var j = 0; j < conns.length; j++) {
- var connection = QDRService.flatten(attrs, conns[j])
- var role = connection.role
- var properties = connection.properties || {};
- var dir = connection.dir
- if (role == "inter-router") {
- var connId = connection.container
- var target = getContainerIndex(connId, nodeInfo);
- if (target >= 0) {
- getLink(source, target, dir, "", connection.name);
- }
- } else if (role == "normal" || role == "on-demand") {
- // not a router, but an external client
- var name = QDRService.nameFromId(id) + "." + connection.identity;
-
- // if we have any new clients, animate the force graph to position them
- var position = angular.fromJson(localStorage[name]);
- if (!angular.isDefined(position)) {
- animate = true;
- position = {
- x: Math.round(nodes[source].x + 40 * Math.sin(client / (Math.PI * 2.0))),
- y: Math.round(nodes[source].y + 40 * Math.cos(client / (Math.PI * 2.0))),
- fixed: false
- };
- //QDR.log.debug("new client pos (" + position.x + ", " + position.y + ")")
- }// else QDR.log.debug("using previous location")
- if (position.y > height) {
- position.y = Math.round(nodes[source].y + 40 + Math.cos(client / (Math.PI * 2.0)))
- }
- var node = aNode(id, name, role, nodeInfo, nodes.length, position.x, position.y, j, position.fixed, properties)
- var nodeType = QDRService.isAConsole(properties, connection.identity, role, node.key) ? "console" : "client"
- if (role === 'normal') {
- var cdir = getLinkDir(id, connection, onode)
- if (cdir !== 'unknown') {
- var addr = getLinkAddr(id, connection , onode)
- node.user = connection.user
- node.isEncrypted = connection.isEncrypted
- node.host = connection.host
- node.connectionId = connection.identity
- node.cdir = cdir
- // determine arrow direction by using the link directions
- if (!normalsParent[nodeType+cdir]) {
- normalsParent[nodeType+cdir] = node;
- nodes.push(node);
- node.normals = [{name: node.name, addr: addr}];
- // now add a link
- getLink(source, nodes.length - 1, cdir, "small", connection.name);
- client++;
- } else {
- normalsParent[nodeType+cdir].normals.push({name: node.name, addr: addr})
- }
- } else {
- unknowns.push(node)
- }
- } else {
- nodes.push(node)
- // now add a link
- getLink(source, nodes.length - 1, dir, "small", connection.name);
- client++;
- }
- }
- }
- source++;
- }
- }
-
- // vary the following force graph attributes based on nodeCount
- // <= 6 routers returns min, >= 80 routers returns max, interpolate linearly
- var forceScale = function(nodeCount, min, max) {
- var count = nodeCount
- if (nodeCount < 6) count = 6
- if (nodeCount > 200) count = 200
- var x = d3.scale.linear()
- .domain([6,200])
- .range([min, max]);
-//QDR.log.debug("forceScale(" + nodeCount + ", " + min + ", " + max + " returns " + x(count) + " " + x(nodeCount))
- return x(count)
- }
- var linkDistance = function (d, nodeCount) {
- if (d.target.nodeType === 'inter-router')
- return forceScale(nodeCount, 150, 20)
- return forceScale(nodeCount, 75, 10)
- }
- var charge = function (d, nodeCount) {
- if (d.nodeType === 'inter-router')
- return forceScale(nodeCount, -1800, -200)
- return -900
- }
- var gravity = function (d, nodeCount) {
- return forceScale(nodeCount, 0.0001, 0.1)
- }
-
- var initGraph = function () {
- d3.select("#SVG_ID").remove();
- svg = d3.select('#topology')
- .append('svg')
- .attr("id", "SVG_ID")
- .attr('width', width)
- .attr('height', height)
- .on("contextmenu", function(d) {
- if (d3.event.defaultPrevented)
- return;
- d3.event.preventDefault();
-
- //if ($scope.addingNode.step != 0)
- // return;
- if (d3.select('#svg_context_menu').style('display') !== 'block')
- $(document).click();
- d3.select('#svg_context_menu')
- .style('left', (mouseX + $(document).scrollLeft()) + "px")
- .style('top', (mouseY + $(document).scrollTop()) + "px")
- .style('display', 'block');
- })
- .on('click', function(d) {
- removeCrosssection()
- });
-
- svg.append("svg:defs").selectAll('marker')
- .data(["end-arrow", "end-arrow-selected", "end-arrow-small", "end-arrow-highlighted"]) // Different link/path types can be defined here
- .enter().append("svg:marker") // This section adds in the arrows
- .attr("id", String)
- .attr("viewBox", "0 -5 10 10")
- .attr("markerWidth", 4)
- .attr("markerHeight", 4)
- .attr("orient", "auto")
- .classed("small", function (d) {return d.indexOf('small') > -1})
- .append("svg:path")
- .attr('d', 'M 0 -5 L 10 0 L 0 5 z')
-
- svg.append("svg:defs").selectAll('marker')
- .data(["start-arrow", "start-arrow-selected", "start-arrow-small", "start-arrow-highlighted"]) // Different link/path types can be defined here
- .enter().append("svg:marker") // This section adds in the arrows
- .attr("id", String)
- .attr("viewBox", "0 -5 10 10")
- .attr("refX", 5)
- .attr("markerWidth", 4)
- .attr("markerHeight", 4)
- .attr("orient", "auto")
- .append("svg:path")
- .attr('d', 'M 10 -5 L 0 0 L 10 5 z');
-
- var grad = svg.append("svg:defs").append("linearGradient")
- .attr("id", "half-circle")
- .attr("x1", "0%")
- .attr("x2", "0%")
- .attr("y1", "100%")
- .attr("y2", "0%");
- grad.append("stop").attr("offset", "50%").style("stop-color", "#C0F0C0");
- grad.append("stop").attr("offset", "50%").style("stop-color", "#F0F000");
-
- // handles to link and node element groups
- path = svg.append('svg:g').selectAll('path')
- circle = svg.append('svg:g').selectAll('g')
-
- }
-
- var initLegend = function () {
- // the legend
- d3.select("#svg_legend svg").remove();
- lsvg = d3.select("#svg_legend")
- .append('svg')
- .attr('id', 'svglegend')
- lsvg = lsvg.append('svg:g')
- .attr('transform', 'translate(' + (radii['inter-router'] + 2) + ',' + (radii['inter-router'] + 2) + ')')
- .selectAll('g');
- }
-
- var initForce = function () {
- // convert link source/target into node index numbers
- links.forEach( function (link, i) {
- if (link.source.id) {
- link.source = link.source.id
- link.target = link.target.id
- }
- })
- var routerCount = nodes.filter(function (n) {
- return n.nodeType === 'inter-router'
- }).length
-
- force = d3.layout.force()
- .nodes(nodes)
- .links(links)
- .size([width, height])
- .linkDistance(function(d) { return linkDistance(d, routerCount) })
- .charge(function(d) { return charge(d, routerCount) })
- .friction(.10)
- .gravity(function(d) { return gravity(d, routerCount) })
- .on('tick', tick)
- .on('end', function () {savePositions()})
- .start()
- }
- // initialize the nodes and links array from the QDRService.topology._nodeInfo object
- var initForceGraph = function() {
- nodes = [];
- links = [];
- var nodeInfo = QDRService.topology.nodeInfo();
- var nodeCount = Object.keys(nodeInfo).length
-
- var oldSelectedNode = selected_node
- var oldMouseoverNode = mouseover_node
- mouseover_node = null;
- selected_node = null;
- selected_link = null;
-
- savePositions();
- initGraph()
-
- $(document).keyup(function(e) {
- if (e.keyCode === 27) {
- removeCrosssection()
- }
- });
-
- initLegend()
-
- // mouse event vars
- mousedown_link = null;
- mousedown_node = null;
- mouseup_node = null;
-
- // initialize the list of nodes
- initializeNodes(nodeInfo)
- savePositions()
-
- // initialize the list of links
- var unknowns = []
- initializeLinks(nodeInfo, unknowns)
- $scope.schema = QDRService.schema;
- // init D3 force layout
- initForce()
-
- // app starts here
- restart(false);
- force.start();
- if (oldSelectedNode) {
- d3.selectAll('circle.inter-router').classed("selected", function (d) {
- if (d.key === oldSelectedNode.key) {
- selected_node = d;
- return true
- }
- return false
- })
- }
- if (oldMouseoverNode && selected_node) {
- d3.selectAll('circle.inter-router').each(function (d) {
- if (d.key === oldMouseoverNode.key) {
- mouseover_node = d
- QDRService.ensureAllEntities([{entity: ".router.node", attrs: ["id","nextHop"]}], function () {
- nextHop(selected_node, d);
- restart();
- })
- }
- })
- }
- setTimeout(function () {
- updateForm(Object.keys(QDRService.topology.nodeInfo())[0], 'router', 0);
- })
-
- // if any clients don't yet have link directions, get the links for those nodes and restart the graph
- if (unknowns.length > 0)
- setTimeout(resolveUnknowns, 10, nodeInfo, unknowns)
-
- var continueForce = function (extra) {
- if (extra > 0) {
- --extra
- force.start()
- setTimeout(continueForce, 100, extra)
- }
- }
- continueForce(forceScale(nodeCount, 20, 200)) // give graph time to settle down
- }
-
- var resolveUnknowns = function (nodeInfo, unknowns) {
- var unknownNodes = {}
- // collapse the unknown node.keys using an object
- for (var i=0; i<unknowns.length; ++i) {
- unknownNodes[unknowns[i].key] = 1
- }
- unknownNodes = Object.keys(unknownNodes)
- //QDR.log.debug("there were " + unknownNodes.length + " connections with normal links")
- //console.dump(unknownNodes)
-
- QDRService.ensureEntities(unknownNodes, {entity: ".router.link", attrs: ["linkType","connectionId","linkDir"], force: true}, function () {
- initializeLinks(nodeInfo, [])
- animate = true;
- force.nodes(nodes).links(links).start();
- restart(false);
- })
- }
-
- function updateForm(key, entity, resultIndex) {
- var nodeInfo = QDRService.topology.nodeInfo();
- if (key in nodeInfo) {
- QDRService.ensureEntities(key, [
- {entity: '.'+entity},
- {entity: '.listener', attrs: ["role", "port"]}], function () {
- var onode = nodeInfo[key]
- if (resultIndex >= onode['.' + entity].results.length)
- return;
- var nodeResults = onode['.' + entity].results[resultIndex]
- var nodeAttributes = onode['.' + entity].attributeNames
- var attributes = nodeResults.map(function(row, i) {
- return {
- attributeName: nodeAttributes[i],
- attributeValue: row
- }
- })
- // sort by attributeName
- attributes.sort(function(a, b) {
- return a.attributeName.localeCompare(b.attributeName)
- })
-
- // move the Name first
- var nameIndex = attributes.findIndex(function(attr) {
- return attr.attributeName === 'name'
- })
- if (nameIndex >= 0)
- attributes.splice(0, 0, attributes.splice(nameIndex, 1)[0]);
-
- // get the list of ports this router is listening on
- if (entity === 'router') {
- var listeners = onode['.listener'].results;
- var listenerAttributes = onode['.listener'].attributeNames;
- var normals = listeners.filter(function(listener) {
- return QDRService.valFor(listenerAttributes, listener, 'role') === 'normal';
- })
- var ports = []
- normals.forEach(function(normalListener) {
- ports.push(QDRService.valFor(listenerAttributes, normalListener, 'port'))
- })
- // add as 2nd row
- if (ports.length) {
- attributes.splice(1, 0, {
- attributeName: 'Listening on',
- attributeValue: ports,
- description: 'The port on which this router is listening for connections'
- });
- }
- }
- $scope.$broadcast('showEntityForm', {
- entity: entity,
- attributes: attributes
- })
- if (!$scope.$$phase) $scope.$apply()
- })
- }
- }
-
- function getContainerIndex(_id, nodeInfo) {
- var nodeIndex = 0;
- for (var id in nodeInfo) {
- if (QDRService.nameFromId(id) === _id)
- return nodeIndex;
- ++nodeIndex;
- }
- return -1;
- }
-
- function getLink(_source, _target, dir, cls, uid) {
- for (var i = 0; i < links.length; i++) {
- var s = links[i].source,
- t = links[i].target;
- if (typeof links[i].source == "object") {
- s = s.id;
- t = t.id;
- }
- if (s == _source && t == _target) {
- return i;
- }
- // same link, just reversed
- if (s == _target && t == _source) {
- return -i;
- }
- }
-
- //QDR.log.debug("creating new link (" + (links.length) + ") between " + nodes[_source].name + " and " + nodes[_target].name);
- var link = {
- source: _source,
- target: _target,
- left: dir != "out",
- right: (dir == "out" || dir == "both"),
- cls: cls,
- uid: uid,
- };
- return links.push(link) - 1;
- }
-
-
- function resetMouseVars() {
- mousedown_node = null;
- mouseover_node = null;
- mouseup_node = null;
- mousedown_link = null;
- }
-
- // update force layout (called automatically each iteration)
- function tick() {
- circle.attr('transform', function(d) {
- var cradius;
- if (d.nodeType == "inter-router") {
- cradius = d.left ? radius + 8 : radius;
- } else {
- cradius = d.left ? radiusNormal + 18 : radiusNormal;
- }
- d.x = Math.max(d.x, radiusNormal * 2);
- d.y = Math.max(d.y, radiusNormal * 2);
- d.x = Math.max(0, Math.min(width - cradius, d.x))
- d.y = Math.max(0, Math.min(height - cradius, d.y))
- return 'translate(' + d.x + ',' + d.y + ')';
- });
-
- // draw directed edges with proper padding from node centers
- path.attr('d', function(d) {
- //QDR.log.debug("in tick for d");
- //console.dump(d);
- var sourcePadding, targetPadding, r;
-
- if (d.target.nodeType == "inter-router") {
- r = radius;
- // right arrow left line start
- sourcePadding = d.left ? radius + 8 : radius;
- // left arrow right line start
- targetPadding = d.right ? radius + 16 : radius;
- } else {
- r = radiusNormal - 18;
- sourcePadding = d.left ? radiusNormal + 18 : radiusNormal;
- targetPadding = d.right ? radiusNormal + 16 : radiusNormal;
- }
- var dtx = Math.max(targetPadding, Math.min(width - r, d.target.x)),
- dty = Math.max(targetPadding, Math.min(height - r, d.target.y)),
- dsx = Math.max(sourcePadding, Math.min(width - r, d.source.x)),
- dsy = Math.max(sourcePadding, Math.min(height - r, d.source.y));
-
- var deltaX = dtx - dsx,
- deltaY = dty - dsy,
- dist = Math.sqrt(deltaX * deltaX + deltaY * deltaY),
- normX = deltaX / dist,
- normY = deltaY / dist;
- var sourceX = dsx + (sourcePadding * normX),
- sourceY = dsy + (sourcePadding * normY),
- targetX = dtx - (targetPadding * normX),
- targetY = dty - (targetPadding * normY);
- sourceX = Math.max(0, Math.min(width, sourceX))
- sourceY = Math.max(0, Math.min(width, sourceY))
- targetX = Math.max(0, Math.min(width, targetX))
- targetY = Math.max(0, Math.min(width, targetY))
-
- return 'M' + sourceX + ',' + sourceY + 'L' + targetX + ',' + targetY;
- });
-
- if (!animate) {
- animate = true;
- force.stop();
- }
- }
-
- // highlight the paths between the selected node and the hovered node
- function findNextHopNode(from, d) {
- // d is the node that the mouse is over
- // from is the selected_node ....
- if (!from)
- return null;
-
- if (from == d)
- return selected_node;
-
- //QDR.log.debug("finding nextHop from: " + from.name + " to " + d.name);
- var sInfo = QDRService.topology.nodeInfo()[from.key];
-
- if (!sInfo) {
- //QDR.log.warn("unable to find topology node info for " + from.key);
- return null;
- }
-
- // find the hovered name in the selected name's .router.node results
- if (!sInfo['.router.node'])
- return null;
- var aAr = sInfo['.router.node'].attributeNames;
- var vAr = sInfo['.router.node'].results;
- var nhIndex = aAr.indexOf("nextHop")
- for (var hIdx = 0; hIdx < vAr.length; ++hIdx) {
- var addrT = QDRService.valFor(aAr, vAr[hIdx], "id");
- if (addrT == d.name) {
- //QDR.log.debug("found " + d.name + " at " + hIdx);
- var nextHop = vAr[hIdx][nhIndex]
- //QDR.log.debug("nextHop was " + nextHop);
- return (nextHop == null) ? nodeFor(addrT) : nodeFor(nextHop);
- }
- }
- return null;
- }
-
- function nodeFor(name) {
- for (var i = 0; i < nodes.length; ++i) {
- if (nodes[i].name == name)
- return nodes[i];
- }
- return null;
- }
-
- function genLinkName(d1, d2) {
- return d1.id + "." + d2.id
- }
- function linkFor(source, target) {
- for (var i = 0; i < links.length; ++i) {
- if ((links[i].source == source) && (links[i].target == target))
- return links[i];
- if ((links[i].source == target) && (links[i].target == source))
- return links[i];
- }
- // the selected node was a client/broker
- //QDR.log.debug("failed to find a link between ");
- //console.dump(source);
- //QDR.log.debug(" and ");
- //console.dump(target);
- return null;
- }
-
- function clearPopups() {
- d3.select("#crosssection").style("display", "none");
- $('.hastip').empty();
- d3.select("#multiple_details").style("display", "none")
- d3.select("#link_details").style("display", "none")
- d3.select('#node_context_menu').style('display', 'none');
-
- }
-
- function removeCrosssection() {
- setTimeout(function() {
- d3.select("[id^=tooltipsy]").remove()
- $('.hastip').empty();
- }, 1010);
- d3.select("#crosssection svg g").transition()
- .duration(1000)
- .attr("transform", "scale(0)")
- .style("opacity", 0)
- .each("end", function (d) {
- d3.select("#crosssection svg").remove();
- d3.select("#crosssection").style("display","none");
- });
- d3.select("#multiple_details").transition()
- .duration(500)
- .style("opacity", 0)
- .each("end", function(d) {
- d3.select("#multiple_details").style("display", "none")
- })
- hideLinkDetails();
- }
-
- function hideLinkDetails() {
- d3.select("#link_details").transition()
- .duration(500)
- .style("opacity", 0)
- .each("end", function(d) {
- d3.select("#link_details").style("display", "none")
- })
- }
-
- function clerAllHighlights() {
- for (var i = 0; i < links.length; ++i) {
- links[i]['highlighted'] = false;
- }
- for (var i=0; i<nodes.length; ++i) {
- nodes[i]['highlighted'] = false;
- }
- }
-
- // takes the nodes and links array of objects and adds svg elements for everything that hasn't already
- // been added
- function restart(start) {
- circle.call(force.drag);
-
- // path (link) group
- path = path.data(links, function(d) {return d.uid});
-
- // update existing links
- path.classed('selected', function(d) {
- return d === selected_link;
- })
- .classed('highlighted', function(d) {
- return d.highlighted;
- })
- .classed('temp', function(d) {
- return d.cls == 'temp';
- })
- .attr('marker-start', function(d) {
- var sel = d === selected_link ? '-selected' : (d.cls === 'small' ? '-small' : '');
- if (d.highlighted)
- sel = "-highlighted"
- return d.left ? 'url(' + urlPrefix + '#start-arrow' + sel + ')' : '';
- })
- .attr('marker-end', function(d) {
- var sel = d === selected_link ? '-selected' : (d.cls === 'small' ? '-small' : '');
- if (d.highlighted)
- sel = "-highlighted"
- return d.right ? 'url(' + urlPrefix + '#end-arrow' + sel + ')' : '';
- })
-
-
- // add new links. if links[] is longer than the existing paths, add a new path for each new element
- path.enter().append('svg:path')
- .attr('class', 'link')
- .attr('marker-start', function(d) {
- var sel = d === selected_link ? '-selected' : (d.cls === 'small' ? '-small' : '');
- return d.left ? 'url(' + urlPrefix + '#start-arrow' + sel + ')' : '';
- })
- .attr('marker-end', function(d) {
- var sel = d === selected_link ? '-selected' : (d.cls === 'small' ? '-small' : '');
- return d.right ? 'url(' + urlPrefix + '#end-arrow' + sel + ')' : '';
- })
- .classed('temp', function(d) {
- return d.cls == 'temp';
- })
- .classed('small', function(d) {
- return d.cls == 'small';
- })
- .on('mouseover', function(d) { // mouse over a path
- if ($scope.addingNode.step > 0) {
- if (d.cls == 'temp') {
- d3.select(this).classed('over', true);
- }
- return;
- }
- //QDR.log.debug("showing connections form");
- var resultIndex = 0; // the connection to use
- var left = d.left ? d.target : d.source;
- // right is the node that the arrow points to, left is the other node
- var right = d.left ? d.source : d.target;
- var onode = QDRService.topology.nodeInfo()[left.key];
- // loop through all the connections for left, and find the one for right
- if (!onode || !onode['.connection'])
- return;
- // update the info dialog for the link the mouse is over
- if (!selected_node && !selected_link) {
- for (resultIndex = 0; resultIndex < onode['.connection'].results.length; ++resultIndex) {
- var conn = onode['.connection'].results[resultIndex];
- /// find the connection whose container is the right's name
- var name = QDRService.valFor(onode['.connection'].attributeNames, conn, "container");
- if (name == right.routerId) {
- break;
- }
- }
- // did not find connection. this is a connection to a non-interrouter node
- if (resultIndex === onode['.connection'].results.length) {
- // use the non-interrouter node's connection info
- left = d.target;
- resultIndex = left.resultIndex;
- }
- if (resultIndex)
- updateForm(left.key, 'connection', resultIndex);
- }
-
- mousedown_link = d;
- selected_link = mousedown_link;
- restart();
- })
- .on('mouseout', function(d) { // mouse out of a path
- if ($scope.addingNode.step > 0) {
- if (d.cls == 'temp') {
- d3.select(this).classed('over', false);
- }
- return;
- }
- //QDR.log.debug("showing connections form");
- selected_link = null;
- restart();
- })
- .on("contextmenu", function(d) { // right click a path
- $(document).click();
- d3.event.preventDefault();
-
- mousedown_link = d;
- d3.select('#link_context_menu')
- .style('left', (mouseX + $(document).scrollLeft()) + "px")
- .style('top', (mouseY + $(document).scrollTop()) + "px")
- .style('display', 'block');
- })
- // left click a path
- .on("click", function (d) {
- var clickPos = d3.mouse(this);
- d3.event.stopPropagation();
- clearPopups();
- var showCrossSection = function() {
- var diameter = 400;
- var format = d3.format(",d");
- var pack = d3.layout.pack()
- .size([diameter - 4, diameter - 4])
- .padding(-10)
- .value(function(d) { return d.size; });
-
- d3.select("#crosssection svg").remove();
- var svg = d3.select("#crosssection").append("svg")
- .attr("width", diameter)
- .attr("height", diameter)
- var svgg = svg.append("g")
- .attr("transform", "translate(2,2)");
-
- var root = {
- name: " Links between " + d.source.name + " and " + d.target.name,
- children: []
- }
- var nodeInfo = QDRService.topology.nodeInfo();
- var connections = nodeInfo[d.source.key]['.connection'];
- var containerIndex = connections.attributeNames.indexOf('container');
- connections.results.some ( function (connection) {
- if (connection[containerIndex] == d.target.routerId) {
- root.attributeNames = connections.attributeNames;
- root.obj = connection;
- root.desc = "Connection";
- return true; // stop looping after 1 match
- }
- return false;
- })
-
- // find router.links where link.remoteContainer is d.source.name
- var links = nodeInfo[d.source.key]['.router.link'];
- var identityIndex = connections.attributeNames.indexOf('identity')
- var roleIndex = connections.attributeNames.indexOf('role')
- var connectionIdIndex = links.attributeNames.indexOf('connectionId');
- var linkTypeIndex = links.attributeNames.indexOf('linkType');
- var nameIndex = links.attributeNames.indexOf('name');
- var linkDirIndex = links.attributeNames.indexOf('linkDir');
-
- if (roleIndex < 0 || identityIndex < 0 || connectionIdIndex < 0
- || linkTypeIndex < 0 || nameIndex < 0 || linkDirIndex < 0)
- return;
- links.results.forEach ( function (link) {
- if (root.obj && link[connectionIdIndex] == root.obj[identityIndex] && link[linkTypeIndex] == root.obj[roleIndex])
- root.children.push (
- { name: " " + link[linkDirIndex] + " ",
- size: 100,
- obj: link,
- desc: "Link",
- attributeNames: links.attributeNames
- })
- })
- if (root.children.length == 0)
- return;
- var node = svgg.datum(root).selectAll(".node")
- .data(pack.nodes)
- .enter().append("g")
- .attr("class", function(d) { return d.children ? "parent node hastip" : "leaf node hastip"; })
- .attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")" + (!d.children ? "scale(0.9)" : ""); })
- .attr("title", function (d) {
- var title = "<h4>" + d.desc + "</h4><table class='tiptable'><tbody>";
- if (d.attributeNames)
- d.attributeNames.forEach( function (n, i) {
- title += "<tr><td>" + n + "</td><td>";
- title += d.obj[i] != null ? d.obj[i] : '';
- title += '</td></tr>';
- })
- title += "</tbody></table>"
- return title
- })
- node.append("circle")
- .attr("r", function(d) { return d.r; });
-
- // node.filter(function(d) { return !d.children; }).append("text")
- node.append("text")
- .attr("dy", function (d) { return d.children ? "-10em" : ".5em"})
- .style("text-anchor", "middle")
- .text(function(d) {
- return d.name.substring(0, d.r / 3);
- });
- $('.hastip').tooltipsy({ alignTo: 'cursor'});
- svgg.attr("transform", "translate(2,2) scale(0.01)")
-
- var bounds = $("#topology").position()
- d3.select("#crosssection")
- .style("display", "block")
- .style("left", (clickPos[0] + bounds.left) + "px")
- .style("top", (clickPos[1] + bounds.top) + "px")
-
- svgg.transition()
- .attr("transform", "translate(2,2) scale(1)")
- .each("end", function () {
- d3.selectAll("#crosssection g.leaf text").attr("dy", ".3em")
- })
- }
- QDRService.ensureEntities(d.source.key, {entity: '.router.link', force: true}, showCrossSection)
- })
- // remove old links
- path.exit().remove();
-
-
- // circle (node) group
- // nodes are known by id
- circle = circle.data(nodes, function(d) { return d.name });
-
- var appendTitle = function(g) {
- g.append("svg:title").text(function(d) {
- var x = '';
- if (d.normals && d.normals.length > 1)
- x = " x " + d.normals.length;
- if (QDRService.isConsole(d)) {
- return 'Dispatch console' + x
- }
- if (d.properties.product == 'qpid-cpp') {
- return 'Broker - qpid-cpp' + x
- }
- if (QDRService.isArtemis(d)) {
- return 'Broker - Artemis' + x
- }
- if (d.cdir === 'in')
- return 'Sender' + x
- if (d.cdir === 'out')
- return 'Receiver' + x
- if (d.cdir === 'both')
- return 'Sender/Receiver' + x
- return d.nodeType == 'normal' ? 'client' + x : (d.nodeType == 'on-demand' ? 'broker' : 'Router ' + d.name)
- })
- }
-
- // update existing nodes visual states
- circle.selectAll('circle')
- .classed('highlighted', function(d) {
- return d.highlighted;
- })
- .classed('selected', function(d) {
- return (d === selected_node)
- })
- .classed('fixed', function(d) {
- return d.fixed
- })
- // add 'multiple' class to existing <g> elements as needed
- .each(function (d) {
- if (d.normals && d.normals.length > 1) {
- // add the "multiple" class to the parent <g>
- var d3g = d3.select(this.parentElement)
- d3g.attr('class', 'multiple')
- d3g.select('title').remove()
- appendTitle(d3g)
- }
- })
-
- // add new circle nodes. if nodes[] is longer than the existing paths, add a new path for each new element
- var g = circle.enter().append('svg:g')
- .classed('multiple', function(d) {
- return (d.normals && d.normals.length > 1)
- })
-
- var appendCircle = function(g) {
- // add new circles and set their attr/class/behavior
- return g.append('svg:circle')
- .attr('class', 'node')
- .attr('r', function(d) {
- return radii[d.nodeType]
- })
- .attr('fill', function (d) {
- if (d.cdir === 'both' && !QDRService.isConsole(d)) {
- return 'url(' + urlPrefix + '#half-circle)'
- }
- return null;
- })
- .classed('fixed', function(d) {
- return d.fixed
- })
- .classed('temp', function(d) {
- return QDRService.nameFromId(d.key) == '__internal__';
- })
- .classed('normal', function(d) {
- return d.nodeType == 'normal'
- })
- .classed('in', function(d) {
- return d.cdir == 'in'
- })
- .classed('out', function(d) {
- return d.cdir == 'out'
- })
- .classed('inout', function(d) {
- return d.cdir == 'both'
- })
- .classed('inter-router', function(d) {
- return d.nodeType == 'inter-router'
- })
- .classed('on-demand', function(d) {
- return d.nodeType == 'on-demand'
- })
- .classed('console', function(d) {
- return QDRService.isConsole(d)
- })
- .classed('artemis', function(d) {
- return QDRService.isArtemis(d)
- })
- .classed('qpid-cpp', function(d) {
- return QDRService.isQpid(d)
- })
- .classed('client', function(d) {
- return d.nodeType === 'normal' && !d.properties.console_identifier
- })
- }
- appendCircle(g)
- .on('mouseover', function(d) { // mouseover a circle
- if ($scope.addingNode.step > 0) {
- d3.select(this).attr('transform', 'scale(1.1)');
- return;
- }
- if (!selected_node) {
- if (d.nodeType === 'inter-router') {
- //QDR.log.debug("showing general form");
- updateForm(d.key, 'router', 0);
- } else if (d.nodeType === 'normal' || d.nodeType === 'on-demand') {
- //QDR.log.debug("showing connections form");
- updateForm(d.key, 'connection', d.resultIndex);
- }
- }
-
- if (d === mousedown_node)
- return;
- //if (d === selected_node)
- // return;
- // enlarge target node
- d3.select(this).attr('transform', 'scale(1.1)');
- // highlight the next-hop route from the selected node to this node
- mousedown_node = null;
-
- if (!selected_node) {
- return;
- }
- clerAllHighlights()
- // we need .router.node info to highlight hops
- QDRService.ensureAllEntities([{entity: ".router.node", attrs: ["id","nextHop"]}], function () {
- mouseover_node = d // save this node in case the topology changes so we can restore the highlights
- nextHop(selected_node, d);
- restart();
- })
- })
- .on('mouseout', function(d) { // mouse out for a circle
- // unenlarge target node
- d3.select(this).attr('transform', '');
- clerAllHighlights()
- mouseover_node = null;
- restart();
- })
- .on('mousedown', function(d) { // mouse down for circle
- if (d3.event.button !== 0) { // ignore all but left button
- return;
- }
- mousedown_node = d;
- // mouse position relative to svg
- initial_mouse_down_position = d3.mouse(this.parentElement.parentElement.parentElement).slice();
- })
- .on('mouseup', function(d) { // mouse up for circle
- if (!mousedown_node)
- return;
-
- selected_link = null;
- // unenlarge target node
- d3.select(this).attr('transform', '');
-
- // check for drag
- mouseup_node = d;
- var mySvg = this.parentElement.parentElement.parentElement;
- // if we dragged the node, make it fixed
- var cur_mouse = d3.mouse(mySvg);
- if (cur_mouse[0] != initial_mouse_down_position[0] ||
- cur_mouse[1] != initial_mouse_down_position[1]) {
- return
-/*
- console.log("mouse pos changed. making this node fixed")
- d.fixed = true;
- setNodesFixed(d.name, true)
- resetMouseVars();
- restart();
- return;
-*/
- }
- // we want a link between the selected_node and this node
- if (selected_node && d !== selected_node) {
- if (d.nodeType !== 'inter-router')
- return;
-
- // add a link from the clicked node to the selected node
- var source = nodes.findIndex( function (n) {
- return (n.key === d.key && n.nodeType === 'inter-router')
- })
- var target = nodes.findIndex( function (n) {
- return (n.key === selected_node.key && n.nodeType === 'inter-router')
- })
- var curLinkCount = links.length
- var newIndex = getLink(source, target, "in", "", genLinkName(d, selected_node));
- // there was already a link from selected to clicked node
- if (newIndex != curLinkCount) {
- selected_node = d
- restart();
- return;
- }
- // add new elements to the svg
- force.links(links).start();
- restart();
- return;
-
- }
-
- // if this node was selected, unselect it
- if (mousedown_node === selected_node) {
- selected_node = null;
- } else {
- if (d.nodeType !== 'normal' && d.nodeType !== 'on-demand')
- selected_node = mousedown_node;
- }
- clerAllHighlights()
- mousedown_node = null;
- if (!$scope.$$phase) $scope.$apply()
- restart(false);
-
- })
- .on("dblclick", function(d) { // circle
- if (d.fixed) {
- d.fixed = false
- setNodesFixed(d.name, false)
- restart() // redraw the node without a dashed line
- force.start(); // let the nodes move to a new position
- }
- if (QDRService.nameFromId(d.key) == '__internal__') {
- editNode();
- if (!$scope.$$phase) $scope.$apply()
- }
- })
- .on("contextmenu", function(d) { // circle
- $(document).click();
- d3.event.preventDefault();
- $scope.contextNode = d;
- if (!$scope.$$phase) $scope.$apply() // we just changed a scope valiable during an async event
- d3.select('#node_context_menu')
- .style('left', (mouseX + $(document).scrollLeft()) + "px")
- .style('top', (mouseY + $(document).scrollTop()) + "px")
- .style('display', 'block');
-
- })
- .on("click", function(d) { // circle
- if (!mouseup_node)
- return;
- // clicked on a circle
- clearPopups();
- if (!d.normals) {
- // circle was a router or a broker
- if (QDRService.isArtemis(d) && Core.ConnectionName === 'Artemis') {
- $location.path('/jmx/attributes?tab=artemis&con=Artemis')
- }
- return;
- }
- clickPos = d3.mouse(this);
- d3.event.stopPropagation();
- })
- //.attr("transform", function (d) {return "scale(" + (d.nodeType === 'normal' ? .5 : 1) + ")"})
- //.transition().duration(function (d) {return d.nodeType === 'normal' ? 3000 : 0}).ease("elastic").attr("transform", "scale(1)")
-
- var appendContent = function(g) {
- // show node IDs
- g.append('svg:text')
- .attr('x', 0)
- .attr('y', function(d) {
- var y = 7;
- if (QDRService.isArtemis(d))
- y = 8;
- else if (QDRService.isQpid(d))
- y = 9;
- else if (d.nodeType === 'inter-router')
- y = 4;
- return y;
- })
- .attr('class', 'id')
- .classed('console', function(d) {
- return QDRService.isConsole(d)
- })
- .classed('normal', function(d) {
- return d.nodeType === 'normal'
- })
- .classed('on-demand', function(d) {
- return d.nodeType === 'on-demand'
- })
- .classed('artemis', function(d) {
- return QDRService.isArtemis(d)
- })
- .classed('qpid-cpp', function(d) {
- return QDRService.isQpid(d)
- })
- .text(function(d) {
- if (QDRService.isConsole(d)) {
- return '\uf108'; // icon-desktop for this console
- }
- if (QDRService.isArtemis(d)) {
- return '\ue900'
- }
- if (QDRService.isQpid(d)) {
- return '\ue901';
- }
- if (d.nodeType === 'normal')
- return '\uf109'; // icon-laptop for clients
- return d.name.length > 7 ? d.name.substr(0, 6) + '...' : d.name;
- });
- }
-
- appendContent(g)
- appendTitle(g);
-
- // remove old nodes
- circle.exit().remove();
-
- // add subcircles
- svg.selectAll('.more').remove();
- svg.selectAll('.multiple')
- .append('svg:path')
- .attr('d', "M1.5,-1 V4 M-1,1.5 H4")
- .attr('class', 'more')
- .attr('transform', "translate(18, -3) scale(2)")
-
- // dynamically create the legend based on which node types are present
- // the legend
- d3.select("#svg_legend svg").remove();
- lsvg = d3.select("#svg_legend")
- .append('svg')
- .attr('id', 'svglegend')
- lsvg = lsvg.append('svg:g')
- .attr('transform', 'translate(' + (radii['inter-router'] + 2) + ',' + (radii['inter-router'] + 2) + ')')
- .selectAll('g');
- var legendNodes = [];
- legendNodes.push(aNode("Router", "", "inter-router", undefined, 0, 0, 0, 0, false, {}))
-
- if (!svg.selectAll('circle.console').empty()) {
- legendNodes.push(aNode("Console", "", "normal", undefined, 1, 0, 0, 0, false, {
- console_identifier: 'Dispatch console'
- }))
- }
- if (!svg.selectAll('circle.client.in').empty()) {
- var node = aNode("Sender", "", "normal", undefined, 2, 0, 0, 0, false, {})
- node.cdir = "in"
- legendNodes.push(node)
- }
- if (!svg.selectAll('circle.client.out').empty()) {
- var node = aNode("Receiver", "", "normal", undefined, 3, 0, 0, 0, false, {})
- node.cdir = "out"
- legendNodes.push(node)
- }
- if (!svg.selectAll('circle.client.inout').empty()) {
- var node = aNode("Sender/Receiver", "", "normal", undefined, 4, 0, 0, 0, false, {})
- node.cdir = "both"
- legendNodes.push(node)
- }
- if (!svg.selectAll('circle.qpid-cpp').empty()) {
- legendNodes.push(aNode("Qpid broker", "", "on-demand", undefined, 5, 0, 0, 0, false, {
- product: 'qpid-cpp'
- }))
- }
- if (!svg.selectAll('circle.artemis').empty()) {
- legendNodes.push(aNode("Artemis broker", "", "on-demand", undefined, 6, 0, 0, 0, false, {}))
- }
- lsvg = lsvg.data(legendNodes, function(d) {
- return d.key;
- });
- var lg = lsvg.enter().append('svg:g')
- .attr('transform', function(d, i) {
- // 45px between lines and add 10px space after 1st line
- return "translate(0, " + (45 * i + (i > 0 ? 10 : 0)) + ")"
- })
-
- appendCircle(lg)
- appendContent(lg)
- appendTitle(lg)
- lg.append('svg:text')
- .attr('x', 35)
- .attr('y', 6)
- .attr('class', "label")
- .text(function(d) {
- return d.key
- })
- lsvg.exit().remove();
- var svgEl = document.getElementById('svglegend')
- if (svgEl) {
- var bb;
- // firefox can throw an exception on getBBox on an svg element
- try {
- bb = svgEl.getBBox();
- } catch (e) {
- bb = {
- y: 0,
- height: 200,
- x: 0,
- width: 200
- }
- }
- svgEl.style.height = (bb.y + bb.height) + 'px';
- svgEl.style.width = (bb.x + bb.width) + 'px';
- }
-
- if (!mousedown_node || !selected_node)
- return;
-
- if (!start)
- return;
- // set the graph in motion
- //QDR.log.debug("mousedown_node is " + mousedown_node);
- force.start();
-
- }
-
- function nextHop(thisNode, d) {
- if ((thisNode) && (thisNode != d)) {
- var target = findNextHopNode(thisNode, d);
- //QDR.log.debug("highlight link from node ");
- //console.dump(nodeFor(selected_node.name));
- //console.dump(target);
- if (target) {
- var hnode = nodeFor(thisNode.name)
- var hlLink = linkFor(hnode, target);
- //QDR.log.debug("need to highlight");
- //console.dump(hlLink);
- if (hlLink) {
- hlLink['highlighted'] = true;
- hnode['highlighted'] = true
- }
- else
- target = null;
- }
- nextHop(target, d);
- }
- if (thisNode == d) {
- var hnode = nodeFor(thisNode.name)
- hnode['highlighted'] = true
- }
- }
-
-
- function mousedown() {
- // prevent I-bar on drag
- //d3.event.preventDefault();
-
- // because :active only works in WebKit?
- svg.classed('active', true);
- }
-
- function hasChanged() {
- // Don't update the underlying topology diagram if we are adding a new node.
- // Once adding is completed, the topology will update automatically if it has changed
- if ($scope.addingNode.step > 0)
- return -2;
- var nodeInfo = QDRService.topology.nodeInfo();
- if (Object.keys(nodeInfo).length != Object.keys(savedKeys).length)
- return Object.keys(nodeInfo).length > Object.keys(savedKeys).length ? 1 : -1;
- // we may have dropped a node and added a different node in the same update cycle
- for (var key in nodeInfo) {
- // if this node isn't in the saved node list
- if (!savedKeys.hasOwnProperty(key))
- return 1;
- // if the number of connections for this node chaanged
- if (nodeInfo[key]['.connection'].results.length != savedKeys[key]) {
- return -1;
- }
- }
- return 0;
- };
-
- function saveChanged() {
- savedKeys = {};
- var nodeInfo = QDRService.topology.nodeInfo();
- // save the number of connections per node
- for (var key in nodeInfo) {
- if (nodeInfo[key]['.connection'])
- savedKeys[key] = nodeInfo[key]['.connection'].results.length;
- }
- //QDR.log.debug("saving current keys");
- //console.dump(savedKeys);
- };
- // we are about to leave the page, save the node positions
- $rootScope.$on('$locationChangeStart', function(event, newUrl, oldUrl) {
- //QDR.log.debug("locationChangeStart");
- savePositions()
- $scope.addingNode.step = 0;
- });
- // When the DOM element is removed from the page,
- // AngularJS will trigger the $destroy event on
- // the scope
- $scope.$on("$destroy", function(event) {
- //QDR.log.debug("scope on destroy");
- savePositions();
- QDRService.setUpdateEntities([])
- QDRService.stopUpdating();
- QDRService.delUpdatedAction("normalsStats");
- QDRService.delUpdatedAction("topology");
- d3.select("#SVG_ID").remove();
- window.removeEventListener('resize', resize);
- });
-
- function handleInitialUpdate() {
- // we only need to update connections during steady-state
- saveChanged();
- animate = true;
- initForceGraph();
- // after the graph is displayed fetch all .router.node info. This is done so highlighting between nodes
- // doesn't incur a delay
- QDRService.ensureAllEntities([{entity: ".router.node", attrs: ["id","nextHop"]}], function () {QDR.log.debug("got .router.node response")})
-
- // call this function every time a background update is done
-/*
- QDRService.addUpdatedAction("topology", function() {
- var changed = hasChanged()
- // there is a new node, we need to get all of it's entities before drawing the graph
- if (changed > 0) {
- //QDRService.delUpdatedAction("topology")
- QDR.log.debug("a new node was detected")
- setupInitialUpdate() // gets the new node's .connection info
- } else if (changed === -1) {
- // we lost a node (or a client), we can draw the new svg immediately
- saveChanged();
- QDR.log.debug("a node was dropped or a client was added/dropped")
- handleInitialUpdate()
- }
- })
-*/
- }
-
- function setupInitialUpdate() {
- // make sure all router nodes have .connection info. if not then fetch any missing info
- QDRService.ensureAllEntities([{entity: ".connection"}], handleInitialUpdate)
- }
-
- $scope.mockTopologies = []
- $scope.mockTopologyDir = ""
- QDRService.sendMethod("amqp:///get-topology/", "", [], "GET-TOPOLOGY-LIST", {}, function (nodeName, entity, response, context) {
- $scope.mockTopologies = response
- QDRService.sendMethod("amqp:///get-topology/", "", [], "GET-TOPOLOGY", {}, function (nodeName, entity, response, context) {
- // this will trigger the watch on this variable which will get the topology
- $timeout(function () {
- $scope.mockTopologyDir = response
- })
- QDRService.setUpdateEntities([".connection"])
- //QDRService.addUpdatedAction("gotTopology", function () {
- // QDRService.delUpdatedAction("gotTopology")
- // $timeout(setupInitialUpdate)
- //})
- //QDRService.topology.get()
- })
- })
- //QDRService.startUpdating();
- //initForceGraph();
- //switchTopology("config-4")
-
- function doAddDialog(NewRouterName) {
- var d = $dialog.dialog({
- dialogClass: "modal dlg-large",
- backdrop: true,
- keyboard: true,
- backdropClick: true,
- controller: 'QDR.NodeDialogController',
- templateUrl: 'node-config-template.html',
- resolve: {
- newname: function() {
- return $scope.baseName;
- },
- address: function () {
- return $scope.clientAddress
- }
- }
- });
- $timeout(function () {
- d.open().then(function(result) {
- if (result)
- $scope.baseName = result.baseName
- $scope.clientAddress = result.address
- });
- })
- };
-
- }
- ]);
-
- QDR.module.controller("QDR.NodeDialogController", function($scope, QDRService, dialog, newname, address) {
- $scope.entity = {description: "Settings", attributes: []}
- var attribute = {name: "prefix", humanName: "New router prefix", input: "input", type: "text",
- value: newname, required: true}
- $scope.entity.attributes.push(attribute)
- attribute = {name: "address", humanName: "New client address", input: "input", type: "text",
- value: address, required: true}
- $scope.entity.attributes.push(attribute)
-
- $scope.setSettings = function () {
- dialog.close({
- baseName: $scope.entity.attributes[0].value,
- address: $scope.entity.attributes[1].value
- });
- }
-
- $scope.cancel = function () {
- dialog.close()
- }
-
- })
-
-
- return QDR;
-}(QDR || {}));
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/mock/__init__.py
----------------------------------------------------------------------
diff --git a/console/test/mock/__init__.py b/console/test/mock/__init__.py
deleted file mode 100644
index 44f288e..0000000
--- a/console/test/mock/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License
-#
-
-from entities import *
-from nexthop import *
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[5/5] qpid-dispatch git commit: DISPATCH-989 Removing this testing
tool
Posted by ea...@apache.org.
DISPATCH-989 Removing this testing tool
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/fe1f711e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/fe1f711e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/fe1f711e
Branch: refs/heads/master
Commit: fe1f711e26d94078dfe2b3a10f80cc8cb5716452
Parents: 95d1ba5
Author: Ernest Allen <ea...@redhat.com>
Authored: Wed May 9 09:39:24 2018 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Wed May 9 09:39:24 2018 -0400
----------------------------------------------------------------------
console/test/css/brokers.ttf | Bin 2272 -> 0 bytes
console/test/css/dispatch.css | 706 ----------
console/test/css/mock.css | 32 -
console/test/css/plugin.css | 1019 --------------
console/test/fake.py | 317 -----
console/test/html/qdrConnect.html | 105 --
console/test/html/qdrTopology.html | 143 --
console/test/index.html | 114 --
console/test/js/dispatchPlugin.js | 259 ----
console/test/js/navbar.js | 77 --
console/test/js/qdrService.js | 269 ----
console/test/js/qdrSettings.js | 179 ---
console/test/js/qdrTopology.js | 2140 ------------------------------
console/test/mock/__init__.py | 22 -
console/test/mock/entities.py | 358 -----
console/test/mock/nexthop.py | 145 --
console/test/package.json | 14 -
console/test/topologies/schema.json | 1814 -------------------------
18 files changed, 7713 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/css/brokers.ttf
----------------------------------------------------------------------
diff --git a/console/test/css/brokers.ttf b/console/test/css/brokers.ttf
deleted file mode 100644
index ae83968..0000000
Binary files a/console/test/css/brokers.ttf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/css/dispatch.css
----------------------------------------------------------------------
diff --git a/console/test/css/dispatch.css b/console/test/css/dispatch.css
deleted file mode 100644
index 0096f95..0000000
--- a/console/test/css/dispatch.css
+++ /dev/null
@@ -1,706 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-svg {
- background-color: transparent;
- cursor: default;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- -o-user-select: none;
- user-select: none;
-}
-
-svg:not(.active):not(.ctrl) {
- cursor: crosshair;
-}
-#end-arrow-selected, #start-arrow-selected {
- stroke: #33F;
- fill: #33F;
-}
-path.link.selected {
- /* stroke-dasharray: 10,2; */
- stroke: #33F !important;
-}
-
-path.link {
- fill: #000;
- stroke: #000;
- stroke-width: 4px;
- cursor: default;
-}
-
-svg:not(.active):not(.ctrl) path.link {
- cursor: pointer;
-}
-
-path.link.small {
- stroke-width: 2.5;
- stroke: darkgray;
-}
-path.link.highlighted {
- stroke: #6F6 !important;
-}
-marker#start-arrow-highlighted,
-marker#end-arrow-highlighted {
- fill: #6F6;
-}
-marker#start-arrow-small,
-marker#end-arrow-small {
- fill: darkgray;
-}
-
-path.link.dragline {
- pointer-events: none;
-}
-
-path.link.hidden {
- stroke-width: 0;
-}
-
-circle.node {
- stroke-width: 1.5px;
- cursor: pointer;
- stroke: darkgray;
-}
-
-circle.node.reflexive {
- stroke: #F00 !important;
- stroke-width: 2.5px;
-}
-circle.node.selected {
- stroke: #6F6 !important;
- stroke-width: 2px;
- fill: #e0e0ff !important;
-}
-circle.node.highlighted {
- stroke: #6F6;
-}
-circle.node.inter-router {
- fill: #EAEAEA;
-}
-circle.node.normal.in {
- fill: #F0F000;
-}
-circle.node.normal.out {
- fill: #C0F0C0;
-}
-circle.node.on-demand {
- fill: #C0FFC0;
-}
-circle.node.on-demand.artemis {
- fill: #FCC;
- /*opacity: 0.2; */
-}
-
-circle.node.fixed {
- stroke-dasharray: 10,2;
-}
-text {
- font: 12px sans-serif;
- pointer-events: none;
- /*font-family: monospace;*/
-
-}
-
-.tooltipsy
-{
- padding: 10px;
-/* max-width: 320px;*/
- color: #303030;
- background-color: #fcfcfe;
- border: 1px solid #deca7e;
- border-radius: 5px;
-}
-
-.tiptable {
-
-}
-.tiptable tr {
- border-bottom: 1px solid #ccc;
-}
-
-.tiptable tr:last-child {
- border-bottom: 0px;
-}
-
-.tiptable tr:nth-child(even) {
- background: #fcfcfe;
-}
-.tiptable tr:nth-child(odd) {
- background: #FFF
-}
-
-text.id {
- text-anchor: middle;
- font-weight: bold;
-}
-
-text.label {
- text-anchor: start;
- font-weight: bold;
-}
-
-.row-fluid.tertiary {
- position: relative;
- left: 20px;
-}
-
-.row-fluid.tertiary.left {
- float: left;
-}
-
-.row-fluid.tertiary.panel {
- width: 410px;
- /*height: 100%; */
-}
-
-div#topologyForm .ngViewport, div#topologyForm .gridStyle {
- height: auto !important;
- min-height: initial !important;
- overflow: initial;
-}
-
-div#multiple_details, div#link_details {
- height: 300px;
- width: 700px;
- display: none;
- padding: 0.5em;
- border: 1px solid;
- position: absolute;
- background-color: white;
- max-height: 330px !important;
- overflow: hidden;
-}
-div#multiple_details div.ngRow.selected {
- background-color: #c9dde1 !important;
-}
-
-div.grid-values {
- text-align: right;
-}
-
-div.grid-values.ngCellText span {
- padding-right: 4px;
-}
-
-.panel-adjacent {
- margin-left: 430px;
-}
-
-/* globe */
-.land {
- fill: #999;
- stroke-opacity: 1;
-}
-
-.graticule {
- fill: none;
- stroke: black;
- stroke-width:.5;
- opacity:.1;
-}
-
-.labels {
- font: 18px sans-serif;
- fill: black;
- opacity: .85;
- text-anchor: middle;
-}
-
-.noclicks { pointer-events:none; }
-
-.point { opacity:.6; }
-
-.arcs {
- opacity:.7;
- stroke: darkgreen;
- stroke-width: 3;
-}
-.flyers {
- stroke-width:1;
- opacity: 0;
- stroke: darkred;
-}
-.arc, .flyer {
- stroke-linejoin: round;
- fill:none;
-}
-.arc { }
-.arc:hover {
- stroke: darkred;
-}
-.flyer { }
-.flyer:hover {
- stroke: darkgreen;
-}
-.arc.inter-router {
- stroke: darkblue;
-}
-
-#addNodeForm {
- padding: 1em;
-}
-
-
-li.currentStep {
- font-weight: bold;
-}
-
-.qdrTopology div.panel {
- position: absolute;
-}
-/*
-.ui-dialog-titlebar {
- border: 0;
- background: transparent;
-}
-*/
-
-/*
-.ui-tabs.ui-tabs-vertical {
- padding: 0;
- width: 48em;
-}
-.ui-tabs.ui-tabs-vertical .ui-widget-header {
- border: none;
-}
-.ui-tabs.ui-tabs-vertical .ui-tabs-nav {
- float: left;
- width: 10em;
- background: #CCC;
- border-radius: 4px 0 0 4px;
- border-right: 1px solid gray;
-}
-.ui-tabs.ui-tabs-vertical .ui-tabs-nav li {
- clear: left;
- width: 100%;
- margin: 0.1em 0;
- border: 1px solid gray;
- border-width: 1px 0 1px 1px;
- border-radius: 4px 0 0 4px;
- overflow: hidden;
- position: relative;
- right: -2px;
- z-index: 2;
-}
-.ui-tabs.ui-tabs-vertical .ui-tabs-nav li a {
- display: block;
- width: 100%;
- padding: 0.1em 1em;
-}
-.ui-tabs.ui-tabs-vertical .ui-tabs-nav li a:hover {
- cursor: pointer;
-}
-.ui-tabs.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active {
- margin-bottom: 0.2em;
- padding-bottom: 0;
- border-right: 1px solid white;
-}
-.ui-tabs.ui-tabs-vertical .ui-tabs-nav li:last-child {
- margin-bottom: 10px;
-}
-.ui-tabs.ui-tabs-vertical .ui-tabs-panel {
- float: left;
- width: 34em;
- border-left: 1px solid gray;
- border-radius: 0;
- position: relative;
- left: -1px;
-}
-
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected {
- right: -3px !important;
-}
-
-.ui-tabs li i.ui-icon {
- display: inline-block;
-}
-*/
-.ui-tabs .ui-tabs-panel {
- /* padding-top: 0 !important; */
-}
-
-.ui-widget-content fieldset {
- float: left;
- padding: 0 1em 0 0;
-}
-
-.entity-description {
- color: #960;
- font-size: 90%;
-}
-
-.attr-description {
- padding-top: 1.5em;
- float: right;
- width: 17em;
-}
-.attr-annotations {
- padding-top: 2.5em;
- clear: both;
-}
-.attr-annotations > span {
- padding-top: 0.5em;
- border-top: 1px dashed darkgray;
- display: block;
-}
-
-.attr-type {
- color: #990;
- font-size: 85%;
-}
-.attr-required {
- color: red;
- font-size: 85%;
-}
-.attr-unique {
- color: green;
- font-size: 85%;
-}
-
-#tabs.nodeEntities {
- border: 0;
-}
-
-#tabs ul.nodeTabs {
- background: #fff;
-}
-
-#tabs #Container {
- border-left: 1px solid #aaa;
-}
-
-#tabs.ui-tabs .ui-tabs-nav li {
- border-bottom: 1px solid #aaa !important;
-}
-
-.entity-fields {
- /* height: 400px; */
- overflow-y: scroll;
- overflow-x: hidden;
-}
-
-div.boolean label:first-child {
- float: left;
- margin-right: 1em;
-}
-div.boolean {
- padding-bottom: 1em;
-}
-
-.entity-fields label {
- font-weight: 600;
- margin-top: 0.5em;
- display: inline;
-}
-
-.aggregate {
- text-align: right;
-}
-
-.aggregate i {
- float: right;
- /* margin: 3px 3px 3px 8px; */
-}
-
-.aggregate .hastip {
- padding: 5px;
-}
-
-.subTip .tipsy-inner {
- background-color: white;
- color: black;
- font-size: 1.3em;
- border: 1px solid black;
-}
-
-.subTip .tipsy-arrow-n { border-bottom-color: black; }
-.subTip .tipsy-arrow-s { border-top-color: black; }
-.subTip .tipsy-arrow-e { border-left-color: black; }
-.subTip .tipsy-arrow-w { border-right-color: black; }
-
-
-.contextMenu {
- display:none;
- position:absolute;
- left:30px;
- top:-30px;
- z-index:999;
- /* width:300px; */
-}
-.contextMenu ul {
- width:300px;
- margin:0;
- padding-left:0;
- list-style:none;
- background:#fff;
- color:#333;
- font-weight: 600;
- /* -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; */
- -moz-box-shadow:5px 5px 5px #ddd; -webkit-box-shadow:5px 5px 5px #999; box-shadow:5px 5px 5px #ddd;
- border: 1px solid #aaa;
-}
-.contextMenu ul li {
- padding:5px 10px;
- /* border-bottom: solid 1px #ccc; */
-}
-.contextMenu ul li:hover {
- background:#4a90d9; color:#fff;
-}
-.contextMenu ul li:last-child {
- border:none;
-}
-
-.na {
- display: none;
-}
-.contextMenu ul li.new {
- display: block;
-}
-.contextMenu ul li.adding, .contextMenu ul li.adding + li {
- display: block;
-}
-.contextMenu ul li.force-display {
- display: block;
-}
-.contextMenu ul li.context-separator {
- background-color: lightgray;
- height: 1px;
- padding: 0;
-}
-
-.ui-tabs.ui-tabs-vertical .ui-tabs-nav li.separated {
- margin-top: 1em;
-}
-
-#crosssection {
- display: none;
- position: absolute;
- top: 200px;
- left: 600px;
-}
-
-.cross-rect {
- /* fill: #cfe2f3; */
-}
-.cross-line {
- stroke: black;
- stroke-width: 4px;
-}
-
-.node circle {
-/* fill: rgb(31, 119, 180);
- fill-opacity: .25; */
- fill: #cfe2f3;
- fill-opacity: .98;
- stroke: black;
- stroke-width: 3px;
-}
-
-circle.subcircle {
- stroke-width: 1px;
- /* stroke-dasharray: 2; */
- fill-opacity: 0;
- stroke: darkgray;
-}
-
-.leaf circle {
- fill: #6fa8dc;
- fill-opacity: 0.95;
- stroke-width: 3px;
-}
-
-.leaf circle[title] {
- font-family: monospace;
-
-}
-
-#svg_legend {
- position: absolute;
- top: 110px;
- right: 0;
- border: 1px solid #ccc;
- border-radius: 5px;
- background-color: #fcfcfc;
- margin-right: 1.3em;
- padding: 1em;
-}
-
-#svg_legend svg {
- height: 235px;
- width: 180px;
-}
-
-#multiple_details div.gridStyle {
-/* height: 50em; */
- min-height: 70px !important;
- height: auto !important;
-}
-
-#multiple_details .ngViewport {
- height: auto !important;
-}
-
-#multiple_details .gridCellButton button, #link_details .gridCellButton button {
- margin: .25em .4em;
- font-size: 12px;
- height: 2em;
- padding-top: .1em;
-}
-
-#linkFilter {
- display: none;
- padding: 0.5em;
- border: 1px solid grey;
- background-color: #F0F0F0;
- position: absolute;
- z-index: 100;
- right: 1em;
-}
-div.formLine label, div.formLine input {
- display: inline-block;
- padding: 0 8px;
-}
-
-span.filter-icon {
- padding-left: 1em;
-}
-
-button.filter-close {
- width: 15px;
- height: 20px;
- padding: 0;
- position: absolute;
- right: 4px;
- top: 4px;
-}
-
-div.filter-title h6 {
- margin: 0 0 0.5em 0;
-}
-
-.links button.btn-filter {
- padding: 0 1em 0 0;
- margin-left: 1em;
- font-size: 1em;
-}
-
-button.btn-filter {
- float: right;
-}
-span.fancytree-expanded button.btn-filter,
-a.fancytree-title:hover button.btn-filter {
- visibility: visible;
-}
-
-div.hdash-button a {
- color: white;
-}
-
-.linkDirIn {
- color: red;
- background-color: #f3f3f3;
-}
-
-.linkDirOut {
- color: blue;
- background-color: white;
-}
-
-div.topoGrid .ui-grid-viewport {
- overflow: hidden !important;
-}
-
-@-moz-document url-prefix() {
- .btn {padding: 2px 12px 8px !important;}
- #overview-controller .btn {padding: 4px 12px !important;}
- #overview-controller .btn.filter-close {padding: 0 !important;}
-}
-
-.ui-fancytree.fancytree-container {
- font-size: 14px;
-}
-
-.grid-title {
- background-color: #FAFAFA;
- background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
- background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
- background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
- background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFF', endColorstr='#F2F2F2', GradientType=0);
- border-bottom: 1px solid #d4d4d4;
- text-shadow: 0 1px 0 #FFFFFF;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
- margin: 0 0 10px 0;
- padding-bottom: 4px;
-}
-
-.expand-collapse {
- float: right;
- margin-right: 0.5em;
-}
-
-.pane-viewport {
- top: 26px !important;
-}
-.fancytree-node.loading {
- position: initial;
-}
-
-.newChart {
- float: right;
-}
-
-select.unique, input.unique {
- border: 2px solid blue;
-}
-select.required, input.required {
- border: 2px solid black;
-}
-
-.required-indicator {
- padding-left: 0.5em;
- font-size: 0.85em;
- vertical-align: super;
-}
-
-.required-indicator::before {
- content: '(required)'
-}
-
-.unique-indicator {
- padding-left: 0.5em;
- font-size: 0.85em;
- vertical-align: super;
-}
-
-.unique-indicator::before {
- content: '(must be unique if supplied)'
-}
-
-.unique-indicator
-
-.error {
- color: red;
- font-weight: bold;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/css/mock.css
----------------------------------------------------------------------
diff --git a/console/test/css/mock.css b/console/test/css/mock.css
deleted file mode 100644
index 374359d..0000000
--- a/console/test/css/mock.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License
-*/
-
-#buttonBar {
- margin-left: 2em;
-}
-
-#buttonBar select {
- position: relative;
- top: 6px;
-}
-
-path.more {
- stroke-width: 1;
- stroke: black;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/css/plugin.css
----------------------------------------------------------------------
diff --git a/console/test/css/plugin.css b/console/test/css/plugin.css
deleted file mode 100644
index f7259dd..0000000
--- a/console/test/css/plugin.css
+++ /dev/null
@@ -1,1019 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-main-display > .span8 {
- height: 100%;
- position: relative;
-}
-
-ul.qdrListNodes > li > span {
- padding: 6px 20px; 6px; 6px;
- display: block;
-}
-
-.qdrList .grid {
- width: 20em;
- margin-right: 0;
- float: left;
-}
-
-
-.qdrList div.gridDetails {
- width: auto;
-}
-
-.selectedItems {
- /* margin-left: 21em; */
-}
-
-.qdrListPane {
- top: 110px;
-}
-
-.qdrListActions {
- width: auto;
- margin-left: 1em;
-}
-
-div.listAttrName {
- padding-top: 5px;
-}
-
-div.listAttrName button {
- float: right;
- margin: 3px 5px;
-}
-
-div.listAggrValue button {
- margin: 3px 5px;
-}
-
-@-moz-document url-prefix() {
- div.listAttrName button {
- top: -24px;
- position: relative;
- margin: 3px 0px;
- padding: 0 5px !important;
- }
-}
-
-div.listAttrName i.icon-bar-chart.active, div.hastip i.icon-bar-chart.active, li.haschart i {
- /*background-color: #AAFFAA; */
-}
-
-div#main div ul.nav li a:not(.btn) {
- background: initial !important;
-}
-
-div#main div ul.nav li.active a {
- background-color: #f0f0ff !important;
-}
-
-div#main.qdr {
- margin-top: 56px !important;
-}
-
-div.charts-header {
- font-size: 1.2em;
- color: #666666;
- margin: 1em 0;
-}
-
-.selectedNode, .selectedAction, .selectedEntity {
- font-weight: 600;
- color: #606066;
-}
-
-.okButton {
- text-align: center;
- margin: 1em;
-}
-
-span.showChartsLink {
- border: 1px solid blue;
- padding: 1px 2px;
-}
-
-div.listGraphs p {
- margin: 1em 0 2em 2em;
- text-align: center;
-}
-
-div.centered {
- text-align: center;
- margin: 4em;
-}
-
-.modal-body.centered {
- margin: 0;
-}
-
-/* dialog */
-div.aChart {
- height: 200px;
- width: 400px;
- margin: 1em;
-}
-
-/* dashboard */
-div.aChart.hDash {
- /* width: 21em; */
- /* height: 17em; */
- width: 100%;
- height: 87%;
- margin: 0;
- padding: 0;
-
-}
-div.chartContainer {
- float: left;
- width: 100%;
- height: 100%;
- overflow: hidden;
-}
-
-/* the x and y axis lines */
-.d3Chart g.axis path.domain {
- stroke-width: 1;
- stroke: black;
-}
-
-/* the line surrounding the area chart */
-div.d3Chart path {
-/* stroke: black; */
-/* stroke-width: 0; */
-/* opacity: 0.5; */
-}
-
-/* the line above the area chart */
-/* the color gets overridden */
-div.d3Chart path.line {
- stroke: steelblue;
- stroke-width: 1.5;
- fill: none;
- opacity: 1;
-}
-
-.mo-rect {
- fill: #ffffdd;
- stroke: #f0f0f0;
- stroke-width: 1;
-}
-
-.mo-guide {
- fill: none;
- stroke: #d0d0d0;
- stroke-width: 2;
- stroke-dasharray: 3,3;
-}
-
-div.d3Chart .title {
- text-decoration: underline;
-}
-
-
-.axis line, .axis path {
- fill: none;
- shape-rendering: crispEdges;
- stroke-width: 1;
- stroke: #000000;
-}
-
-.axis line {
- stroke: #C0C0C0;
- stroke-dasharray: 1,1;
- opacity: 0.5;
-}
-
-.y.axis text, .x.axis text, .focus text, div.d3Chart .title {
- font-size: 12px;
-}
-
-.y.axis path {
- stroke: #000;
- }
-
-.overlay {
- fill: none;
- pointer-events: all;
- }
-
-.focus circle {
- fill: none;
- stroke: steelblue;
- }
-.focus .fo-table {
- /* box-shadow: 2px 2px 3px #EEE; */
-}
-
-div.d3Chart {
- /* padding: 1em 0; */
- /* border: 1px solid #C0C0C0; */
- margin-bottom: 2em;
-}
-div.d3Chart.hDash {
- border: 0px;
-}
-
-div.d3Chart .axis path {
- display: inherit;
-}
-
-.c3-circle {
- /* display: none; */
-}
-
-.fo-table {
- border: 1px solid darkgray;
- background-color: white;
- font-size: .85em;
-}
-
-.fo-table td {
- padding: 4px;
- border-left: 1px solid darkgray;
-}
-.fo-table tr.detail td {
- padding: 1px 4px;
-}
-.fo-title {
- color: white;
- background-color: darkgray;
-}
-
-.fo-table-legend {
- width: 8px;
- height: 8px;
- border: 1px solid black;
- margin: 0 4px;
- display: inline-block;
-}
-
-svg .legend {
- dominant-baseline: central;
-}
-
-div.chartContainer div.aChart {
- margin-top: 0.5em;
-}
-
-div#main.qdr div ul.nav li.active a {
- background-color: #e0e0ff !important;
- color: #000000;
-}
-
-div#main.qdr .selected, .box.selected {
- color: #000000;
- text-shadow: none;
-}
-
-/* the selected node on the list page */
-div.qdrList li.active, ul.qdrListNodes li.active {
- background-color: #e0e0ff;
-}
-
-div.qdr-attributes span.fancytree-selected a {
- background-color: #e0e0ff;
-}
-div.qdr-attributes.pane, div.qdr-topology.pane {
- position: absolute;
- margin-left: 10px;
-}
-div.qdr-overview.pane {
- position: absolute;
-}
-div.qdr-topology.pane.left {
- width: auto;
- /*border-right: 1px solid lightgray; */
-}
-
-/* the selected row in the name table */
-div#main.qdr div.qdrList div.selected {
- background-color: #e0e0ff !important;
-}
-
-#dialogChart, #dialogEditChart {
- height: 220px;
-}
-
-.chartOptions .modal-body {
- overflow-y: initial;
-}
-
-div.qdrCharts p.chartLabels button {
- float: right;
-}
-
-div.qdrCharts p.chartLabels {
- padding-right: 1em;;
- }
-
-p.dialogHeader {
- text-align: center;
-}
-
-p.dialogHeader input {
- margin-top: 10px;
- width: 480px;
-}
-
-.ui-slider-tick {
- position: absolute;
- background-color: #666;
- width: 2px;
- height: 8px;
- top: 12px;
- z-index: -1;
-}
-
-label.rateGroup {
- float: left;
-}
-
-div.chartOptions div.dlg-slider {
- float: left;
- width: 28em;
- font-size: 14px;
-}
-
-div.chartOptions div.duration {
- width: 35em !important;
-}
-
-div.chartOptions .slider {
- margin-top: 1em;
- margin-bottom: 1em;
-}
-
-input[type="radio"] {
- margin-top: 0 !important;
-}
-
-div.chartOptions legend {
- font-size: 1.2em;
- font-weight: bold;
- margin-bottom: 10px;
-}
-
-div.chartOptions tab > div {
- margin-left: 1em;
-}
-
-div.chartOptions span.minicolors-swatch {
- width: 14px;
- height: 14px;
-}
-
-.minicolors-input {
- width: 4em;
- padding: 0 0 0 24px !important;
-}
-
-div.colorPicker div.colorText {
- display: inline-block;
- width: 10em;
-}
-div.colorPicker div:nth-of-type(1), /* first span under div.colorPicker */
- div.minicolors{
- float:left;
- margin-right: 0.5em;
-}
-
-div.chartOptions p.sep {
- height: 1em;
-}
-
-ul.nav-tabs {
- border-bottom: 1px solid #ddd !important;
-}
-
-.chartOptions ul.nav-tabs {
- margin-bottom: 0px !important;
-}
-
-div.tabbable div.tab-content {
- overflow: visible;
-}
-
-div.tabbable ul.nav-tabs > .active > a {
- background-color: #f8f8f8;
- border: 1px solid #ddd;
- border-bottom-color: transparent;
-}
-
-
-div.tabbable .tab-pane {
- background-color: #f8f8f8;
- padding: 12px;
- border-right: 1px solid #ddd;
- border-left: 1px solid #ddd;
- border-bottom: 1px solid #ddd;
-}
-div.dlg-large div.tabbable .tab-pane {
- margin-left: 11em;
-}
-
-div.tabbable ul.nav-tabs {
- margin-bottom: 0;
-}
-
-ul.qdrTopoModes {
- position: relative;
- top: -10px;
-}
-.overview.section {
- /* width: 35em; */
-}
-.overview.section .ngGrid {
- height: 12em !important;
- min-height: 12em !important;
-}
-
-.overview.routers.section .ngGrid {
- height: 16em !important;
- min-height: 16em !important;
-}
-.overview.routers.section {
- /*width: 15em; */
- }
-
-.grid-align-value {
- text-align: right;
-}
-
-.grid-align-value .ngCellText {
- padding-right: 10px;
-}
-
-.overview .ngRow:hover {
- background:#e0e0ff;
-}
-
-.overview-cell .ngCell:hover {
- background:#e0e0ff;
-}
-.overview-cell .ngCell.col0:hover, .overview-cell .ngCell.col1:hover {
- background: initial;
-}
-
-
-.qdr-overview.pane.left, .qdr-attributes.pane.left {
- top: 104px;
-}
-.qdr-topology.pane.left {
- top: 104px;
-}
-.qdr-overview.pane.left, .qdr-attributes.pane.left, .qdr-topology.pane.left {
- left: 10px;
-}
-
-.overview-tree, .qdr-attributes {
- min-height: calc(100vh - 90px)
-}
-/*
-.treeContainer {
- width: 100%;
- float: left;
-}
-*/
-.pane-content {
- overflow: auto;
-}
-
-#entityNames {
- width: 20em;
- float: left;
-}
-
-.treeDetails {
- margin-left: 260px;
-}
-
-.grid:not(.noHighlight) .ui-grid-row:hover .ui-grid-cell-contents {
- /*background-color: #e0e0ff; */
- background-color: #e9f2f9
-}
-.ngCellText {
- padding: 4px 0 0 4px;
-}
-
-.ui-grid-row.ui-grid-row-selected > [ui-grid-row] > .ui-grid-cell {
- background-color: #e0e0ff;
-}
-
-.tab-content .tab-pane {
- background-color: #f8f8f8;
- padding: 12px;
- border-right: 1px solid #ddd;
- border-left: 1px solid #ddd;
- border-bottom: 1px solid #ddd;
-}
-
-div.chartOptions ul.nav-tabs > .active > a {
- background-color: #f8f8f8;
- border: 1px solid #ddd;
- border-bottom-color: transparent;
-}
-
-div.chartOptions label:nth-of-type(2) {
- margin-left: 1em;
-}
-div.chartOptions label {
- font-weight: normal;
- display: inline-block;
-}
-
-/*
-.form-horizontal .control-label {
- float: left;
- width: 160px;
- padding-top: 5px;
- text-align: right;
-}
-
-.form-horizontal .controls {
- margin-left: 180px;
-}
-
-.form-horizontal input, {
- display: inline-block;
- margin-bottom: 0;
- vertical-align: middle;
-}
-
-input[type="text"], input[type="number"], input[type="password"] {
- background-color: #ffffff;
- border: 1px solid #cccccc;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
- -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
- -o-transition: border linear 0.2s, box-shadow linear 0.2s;
- transition: border linear 0.2s, box-shadow linear 0.2s;
-}
-
-input[type="text"], input[type="number"], input[type="password"] {
- display: inline-block;
- width: 200px;
- padding: 4px 6px;
- margin-bottom: 10px;
- font-size: 14px;
- line-height: 20px;
- color: #555555;
- vertical-align: middle;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
-}
-
-.login input[type="checkbox"] {
- margin-top: 0.75em;
-}
-*/
-
-#dispatch-login-container {
- /* width: 18.5em; */
- margin-top: 2em;
-}
-/*
-div.login.container {
- width: 550px;
-}
-*/
-
-
-#overtree .fancytree-container {
- border: 0px;
-}
-
-#overtree span.fancytree-alert-icon.ui-icon-refresh {
- background-position: -64px -80px;
-}
-#overtree span.fancytree-alert-icon.ui-icon-transfer-e-w {
- background-position: -112px -80px;
-}
-
-#alerts {
- position: fixed;
- right: 0;
- top: 0;
- z-index: 100;
-}
-
-.alert-enter,
-.alert-leave,
-.alert-move {
- -webkit-transition: 1s linear all;
- -moz-transition: 1s linear all;
- -o-transition: 1s linear all;
- transition: 1s linear all;
- position:relative;
-}
-
-.alert-enter {
- left:-10px;
- opacity:0;
-}
-.alert-enter.alert-enter-active {
- left:0;
- opacity:1;
-}
-
-.alert-leave {
- left:0;
- opacity:1;
-}
-.alert-leave.alert-leave-active {
- left:-10px;
- opacity:0;
-}
-
-.alert-move {
- opacity:0.5;
-}
-.alert-move.alert-move-active {
- opacity:1;
-}
-
-.overview .table-striped tr:hover td {
- background-color: #e0e0ff !important;
-}
-
-#entityNames div.ngViewport {
- overflow-x: hidden;
-}
-
-.connect-column.connect-form {
- width: 20em;
-}
-
-.chartLabels button a {
- text-decoration: none;
-}
-
-.fancytree-ico-c.router .fancytree-icon {
-
-}
-
-.tabs-left .nav-tabs {
- float: left;
-}
-.tabs-left .nav-tabs > li {
-/* float: initial; */
-}
-
-div.modal.dlg-large {
- width: 53em;
-}
-
-button.hdash-button a {
- text-decoration: none;
- color: #fff;
-}
-
-div.widget-body > div {
- height: 100%;
-}
-
-div.qdrCharts {
- height: 100%;
-}
-
-ul.dispatch-view {
- margin-bottom: 0 !important;
-}
-
-.qdr-overview.pane.left span:not(.fancytree-has-children) .fancytree-icon:before,
-.qdr-attributes.pane.left span:not(.fancytree-has-children) .fancytree-icon:before {
- color: green;
-}
-
-span:not(.fancytree-has-children).address .fancytree-icon:before,
-span:not(.fancytree-has-children).router\.address .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f0ac";
-}
-span:not(.fancytree-has-children).address.mobile .fancytree-icon:before,
-span:not(.fancytree-has-children).router\.address.mobile .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f109";
-}
-span:not(.fancytree-has-children).address.internal.mobile .fancytree-icon:before,
-span:not(.fancytree-has-children).router\.address.internal.mobile .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f0ac";
-}
-span:not(.fancytree-has-children).address.router .fancytree-icon:before,
-span:not(.fancytree-has-children).router\.address.router .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f047";
-}
-
-span.address-link .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f0ac";
-}
-
-span:not(.fancytree-has-children).connection.external .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f109";
-}
-span:not(.fancytree-has-children).connection.normal .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f08e";
-}
-span:not(.fancytree-has-children).connection.external.quiesced .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f14c";
- color: red;
-}
-span:not(.fancytree-has-children).connection.inter-router .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f07e";
-}
-span:not(.fancytree-has-children).connection.router-control .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f013";
-}
-span:not(.fancytree-has-children).no-data .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f05e";
- color: red !important;
-}
-span:not(.fancytree-has-children).loading .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f254";
-}
-span:not(.fancytree-has-children).connector .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f126";
-}
-span:not(.fancytree-has-children).container .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f16c";
-}
-span:not(.fancytree-has-children).log .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f0f6";
-}
-span:not(.fancytree-has-children).router\.node .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f013";
-}
-span:not(.fancytree-has-children).link.inter-router .fancytree-icon:before,
-span:not(.fancytree-has-children).router\.link.inter-router .fancytree-icon:before{
- font-family: FontAwesome;
- content: "\f07e";
-}
-span:not(.fancytree-has-children).link.router-control .fancytree-icon:before,
-span:not(.fancytree-has-children).router\.link.router-control .fancytree-icon:before{
- font-family: FontAwesome;
- content: "\f013";
-}
-span:not(.fancytree-has-children).link.endpoint .fancytree-icon:before,
-span:not(.fancytree-has-children).router\.link.endpoint .fancytree-icon:before{
- font-family: FontAwesome;
- content: "\f109";
-}
-span:not(.fancytree-has-children).link.console .fancytree-icon:before,
-span:not(.fancytree-has-children).router\.link.console .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f108";
-}
-span:not(.fancytree-has-children).listener .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f025";
-}
-span:not(.fancytree-has-children).connection .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f07e";
-}
-span:not(.fancytree-has-children).connection.console .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f108";
-}
-span:not(.fancytree-has-children).waypoint .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f0ec";
-}
-span:not(.fancytree-has-children).router .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f047";
-}
-span:not(.fancytree-has-children).fixedAddress .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f015";
-}
-span:not(.fancytree-has-children).linkRoutePattern .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f039";
-}
-span:not(.fancytree-has-children).allocator .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f170";
-}
-span:not(.fancytree-has-children).policy .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f256";
-}
-span:not(.fancytree-has-children).logStats .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f080";
-}
-span:not(.fancytree-has-children).autoLink .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f0c1";
-}
-span:not(.fancytree-has-children).authServicePlugin .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f0c1";
-}
-span:not(.fancytree-has-children).sslProfile .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f023";
-}
-span:not(.fancytree-has-children).vhost .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f108";
-}
-span:not(.fancytree-has-children).vhostStats .fancytree-icon:before {
- font-family: FontAwesome;
- content: "\f080";
-}
-
-
-.ngCellText {
-/* color: #333333; */
-}
-
-.changed {
- color: #339933;
-}
-
-div.dispatch-router div.help {
- width: auto;
- padding: 1em;
- background-color: lavender;
- border-radius: 6px;
- margin-top: 1em;
- text-align: center;
-}
-
-div.operations tr:nth-child(even) {
- background: #f3f3f3;
-}
-div.operations tr:nth-child(odd), div.operations tr:last-child {
- background: #fff;
-}
-
-div.operations tr input {
- margin: 0;
- padding: 3px 6px;
-}
-div.operations table {
- width: 100%;
-}
-div.operations th {
- width: 50%;
- border-bottom: 1px solid #cccccc;
- text-align: left;
-}
-div.operations td:nth-child(odd), div.operations th:nth-child(odd) {
- border-right: 1px solid #cccccc;
-}
-div.operations td:nth-child(odd) {
- padding-left: 0;
-}
-div.operations td:nth-child(even), div.operations th:nth-child(even) {
- padding-left: 5px;
-}
-div.operations th {
- padding: 5px;
-}
-div.operations .tab-pane.active {
- padding: 12px 12px 12px 0;
-}
-div.operations label {
- padding-top: 4px;
- margin-bottom: 4px;
-}
-.qdrListActions .ngGrid {
- /*min-height: 40em;
- height: 100%; */
-}
-div.qdrListActions .ngViewport {
- height: initial !important;
-}
-
-div.operations .boolean {
- padding-bottom: 0;
-}
-
-table.log-entry {
- margin-bottom: 1em;
- border-top: 1px solid black;
-}
-
-table.log-entry pre {
- background-color: #f5f5f5;
- color: inherit;
- margin: 0;
- white-space: pre-wrap;
-}
-
-circle.node.normal.console {
- fill: lightcyan;
-}
-circle.node.artemis {
- fill: lightgreen;
-}
-circle.node.route-container {
- fill: orange;
-}
-
-text.console, text.on-demand, text.normal {
- font-family: FontAwesome;
- font-weight: normal;
- font-size: 16px;
-}
-
-@font-face {
- font-family:"Brokers";
- src: url("brokers.ttf") /* TTF file for CSS3 browsers */
-}
-
-text.artemis {
- font-family: Brokers;
- font-size: 20px;
- font-weight: bold;
-}
-
-text.qpid-cpp {
- font-family: Brokers;
- font-size: 18px;
- font-weight: bold;
-}
-
-i.red {
- color: red;
-}
-
-.qdrListActions div.delete {
- width: 20em;
- margin: auto;
- border: 1px solid #eaeaea;
- height: 5em;
- padding: 4em;
- background-color: #fcfcfc;
-}
-
-.btn:focus {
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-}
-
-select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus {
- outline:3px solid rgba(82, 168, 236, 0.6);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- outline: 5px auto -webkit-focus-ring-color;
- outline-offset: -2px;
-}
-
-btn.disabled, .btn[disabled] {
- opacity: 0.35;
-}
-
-#dispatch-login-container .ng-invalid-range {
- border-color: #e9322d !important;
-}
-
-div#durationSlider, div#rateSlider {
- margin-top: 1em;
-}
-
-.list-grid {
- padding-left: 10px;
-}
-
-.ngViewport.ng-scope {
- height: auto !important;
-}
-
-.listening-on {
- background-color: #CCFFCC;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/fake.py
----------------------------------------------------------------------
diff --git a/console/test/fake.py b/console/test/fake.py
deleted file mode 100755
index 532d549..0000000
--- a/console/test/fake.py
+++ /dev/null
@@ -1,317 +0,0 @@
-#!/usr/bin/env python
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import optparse
-from proton import Endpoint, generate_uuid
-from proton import Message
-from proton.handlers import MessagingHandler
-from proton.reactor import Container
-import json
-from pprint import pprint
-import os
-import string
-import random
-import shutil
-from mock import Connection, RouterLink, Schema, Listener, RouterNode, Hopper, Router, Address, Policy, Connector, \
- RouterAddresses, Allocators, Logs
-import pdb
-
-def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
- return ''.join(random.choice(chars) for _ in range(size))
-
-class Manager(object):
- def __init__(self, topology, verbose):
- self.topology = topology
- self.verbose = verbose
- self.base = "topologies/"
-
- def operation(self, op, request):
- m = op.replace("-", "_")
- try:
- method = getattr(self, m)
- except AttributeError:
- print op + " is not implemented yet"
- return []
- if self.verbose:
- print "Got request " + op
- return method(request)
-
- def GET_LOG(self, request):
- return []
-
- def GET_SCHEMA(self, request):
- with open(self.base + "schema.json") as fp:
- data = json.load(fp)
- return data
-
- def GET_MGMT_NODES(self, request):
- onlyfiles = []
- if not os.path.exists(self.base + self.topology):
- os.makedirs(self.base + self.topology)
-
- for f in os.listdir(self.base + self.topology):
- if os.path.isfile(os.path.join(self.base + self.topology, f)):
- if os.path.splitext(f)[1] == ".json":
- onlyfiles.append(unicode("amqp:/_topo_/0/" + os.path.splitext(f)[0] + "/$management"))
- '''
- onlyfiles = [
- unicode("amqp:/_topo/0/" + os.path.splitext(f)[0] + "/$management", "utf-8")
- for f in os.listdir(self.topology)
- if os.path.isfile(os.path.join(self.topology, f)) and os.path.splitext(f)[1] == ".json"
- ]
- '''
- if self.verbose:
- pprint (onlyfiles)
- return onlyfiles
-
- def QUERY(self, request):
- #pdb.set_trace()
- if not getattr(request, "address"):
- nodes = self.GET_MGMT_NODES(request)
- node = nodes[0]
- else:
- node = request.address
- print "node is"
- pprint (node)
- nid = node.split('/')[-2]
- fullentity = request.properties["entityType"]
- entity = fullentity[len("org.apache.qpid.dispatch"):]
- if self.verbose:
- pprint("nid is " + nid + " entity is " + entity)
- if not "arrtibuteNmaes" in request.body:
- requestedAttrs = []
- else:
- requestedAttrs = request.body["attributeNames"]
- if not os.path.isfile(self.base + self.topology + "/" + nid + ".json"):
- return {"results": [], "attributeNames": requestedAttrs}
- with open(self.base + self.topology + "/" + nid + ".json") as fp:
- data = json.load(fp)
- ent = data.get(entity, {'attributeNames': [], 'results': []})
- attributeNames = ent['attributeNames']
- allresults = ent['results']
- if len(requestedAttrs) == 0:
- requestedAttrs = attributeNames
- results = []
- for result in allresults:
- newresult = []
- for atr in requestedAttrs:
- atrindex = attributeNames.index(atr)
- if atrindex < 0 or atrindex >= len(result):
- newresult.append('not found')
- else:
- newresult.append(result[atrindex])
- results.append(newresult)
- newdata = {"results": results, "attributeNames": requestedAttrs}
-
- if self.verbose:
- pprint(newdata)
- return newdata
-
- def LOAD(self, request):
- topology = request.properties["topology"]
- fname = self.base + topology + "/nodeslinks.dat"
- if not os.path.isfile(fname):
- if self.verbose:
- print "returning empty topology for " + topology
- return {"nodes": [], "links": [], "topology": topology}
-
- with open(fname) as fp:
- data = json.load(fp)
- return data
-
- def GET_TOPOLOGY(self, request):
- if self.verbose:
- pprint (self.topology)
- return unicode(self.topology)
-
- def GET_TOPOLOGY_LIST(self, request):
- return [unicode(f) for f in os.listdir(self.base) if os.path.splitext(f)[1] != ".json"]
-
- def SWITCH(self, request):
- self.topology = request.properties["topology"]
- return self.LOAD(request)
-
- def PUBLISH(self, request):
- nodes = request.properties["nodes"]
- links = request.properties["links"]
- topology = request.properties["topology"]
- if self.verbose:
- print("PUBLISHing to " + topology)
- shutil.rmtree(self.base + topology)
-
- if not os.path.exists(self.base + topology):
- os.makedirs(self.base + topology)
-
- with open(self.base + topology + "/nodeslinks.dat", "w+") as fp:
- fp.write(json.dumps({"nodes": nodes, "links": links, "topology": topology}, indent=2))
-
- port = 20001
- clients = {}
- connectionId = 1
- # cache any connections and links for clients first
- for node in nodes:
- if node['nodeType'] != 'inter-router':
- if not node['key'] in clients:
- clients[node['key']] = {"connections": [], "links": [], "addresses": []}
-
- for normal in node["normals"]:
- clients[node['key']]["connections"].append(Connection(node, connectionId).vals())
- ldir = "in" if node['cdir'] == "in" else "out"
- owningAddr = "M0" + normal['addr'] if "console_identifier" not in node['properties'] else ""
- clients[node['key']]["links"].append(RouterLink(node, str(len(clients[node['key']]["links"])),
- ldir, owningAddr, "endpoint", connectionId).vals())
- if node['cdir'] == "both":
- otherAddr = "M0" + normal['addr'] if "console_identifier" not in node['properties'] \
- else "Ltemp." + id_generator(15)
- clients[node['key']]["links"].append(RouterLink(node,
- str(len(clients[node['key']]["links"])), "in",
- otherAddr, "endpoint", connectionId).vals())
- connectionId += 1
-
-
- hopper = Hopper(self.verbose)
- for node in nodes:
- if node['nodeType'] == 'inter-router':
- nodeInfo = {}
-
- # this should be driven by the schema and not hard coded like this
- nname = node["name"]
- entities = ("connection", "router", "router.link", "router.node", "allocator",
- "sslProfile", "autoLink", "linkRoute", "address", "policy", "log",
- "vhost", "vhostStats", "listener", "router.address", "connector")
- for entity in entities:
- savedAs = entity
- if entity == "address":
- savedAs = "router.config.address"
- nodeInfo["."+savedAs] = {"results": [], "attributeNames": Schema.schema[entity]["attributeNames"]}
-
- # find all the other nodes that are linked to this node
- nodeCons = []
- nodeLinks = []
- # if the link source or target is this node's id
- for link in links:
- # only process links to other routers
- if link['cls'] != "small":
- toNode = None
- if link['source']['name'] == node['name']:
- toNode = link['target']
- toNode["cdir"] = "in"
- if link['target']['name'] == node['name']:
- toNode = link['source']
- toNode["cdir"] = "out"
- if toNode:
- toNode["container"] = toNode["name"]
- nodeCons.append(Connection(toNode, connectionId).vals())
-
- nodeLinks.append(RouterLink(toNode, str(len(nodeLinks)+1), "in",
- '', "router-control", connectionId).vals())
- nodeLinks.append(RouterLink(toNode, str(len(nodeLinks)+1), "out",
- '', "router-control", connectionId).vals())
- nodeLinks.append(RouterLink(toNode, str(len(nodeLinks)+1), "in",
- '', "inter-router", connectionId).vals())
- nodeLinks.append(RouterLink(toNode, str(len(nodeLinks)+1), "out",
- '', "inter-router", connectionId).vals())
- connectionId += 1
-
- nodeInfo[".connection"]["results"] = nodeCons
- nodeInfo[".router.link"]["results"] = nodeLinks
-
- # add any connections and links for clients
- if node['key'] in clients:
- nodeInfo[".connection"]["results"].extend(clients[node['key']]["connections"])
- nodeInfo[".router.link"]["results"].extend(clients[node['key']]["links"])
-
- nodeInfo[".listener"]["results"].append(Listener(port).vals())
- port += 1
-
- nodeInfo[".router"]["results"].append(Router(node).vals())
- nodeInfo[".router.config.address"]["results"].append(Address().vals())
- nodeInfo[".policy"]["results"].append(Policy().vals())
-
- for connection in nodeInfo[".connection"]["results"]:
- dir = connection[Schema.i("connection", "dir")]
- if dir == "out":
- hostIndex = Schema.i("connection", "host")
- connhost, connport = connection[hostIndex].split(":")
- nodeInfo[".connector"]["results"].append(Connector(connhost, connport).vals())
-
- for n in nodes:
- if n['nodeType'] == 'inter-router':
- nodeInfo[".router.node"]["results"].append(RouterNode(node['name'], n['name'], links, hopper).vals())
-
- nodeInfo[".router.address"]["results"] = RouterAddresses(node, nodes).vals()
- nodeInfo[".allocator"]["results"] = Allocators().vals()
- nodeInfo[".log"]["results"] = Logs().vals()
-
- with open(self.base + topology + "/" + nname + ".json", "w+") as fp:
- fp.write(json.dumps(nodeInfo, indent=2, sort_keys=True))
-
- return "published"
-
-class MockRouter(MessagingHandler):
- def __init__(self, url, topology, verbose):
- super(MockRouter, self).__init__()
- self.url = url
- self.manager = Manager(topology, verbose)
- self.senders = {}
- self.verbose = verbose
-
- def on_start(self, event):
- self.acceptor = event.container.listen(self.url)
-
- def on_link_opening(self, event):
- if event.link.is_sender:
- if event.link.remote_source.dynamic:
- if self.verbose:
- print("opening dynamic sender")
- address = str(generate_uuid())
- event.link.source.address = address
- elif event.link.remote_source.address:
- if self.verbose:
- print("opening remote_source address sender")
- event.link.source.address = event.link.remote_source.address
- else:
- print("received unknown sender link")
- self.senders[event.link.source.address] = event.link
-
- elif event.link.is_receiver:
- if self.verbose:
- print "got a receiver link"
- event.link.target.address = event.link.remote_target.address
-
- def on_message(self, event):
- ret = self.manager.operation(event.message.properties["operation"], event.message)
- m = Message(address=event.message.reply_to, body=ret,
- correlation_id=event.message.correlation_id,
- properties={"statusCode": 200} )
- self.senders[event.message.reply_to].send(m)
-
-parser = optparse.OptionParser(usage="usage: %prog [options]")
-parser.add_option("-a", "--address", default="localhost:5672",
- help="address router listens on (default %default)")
-parser.add_option("-t", "--topology", default="config-80",
- help="which topology directory to return (default %default)")
-parser.add_option("-v", "--verbose", default=False,
- help="display requests and responses to stdout (default %default)")
-opts, args = parser.parse_args()
-
-try:
- Container(MockRouter(opts.address, opts.topology, opts.verbose)).run()
-except KeyboardInterrupt: pass
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/html/qdrConnect.html
----------------------------------------------------------------------
diff --git a/console/test/html/qdrConnect.html b/console/test/html/qdrConnect.html
deleted file mode 100644
index b3500c4..0000000
--- a/console/test/html/qdrConnect.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<style>
- .alert {
- margin-top: 4em;
- }
-
- .login:after {
- content: '';
- display: block;
- clear: both;
-}
-
-</style>
-<div class="row-fluid" ng-controller="QDR.SettingsController">
- <div class="login" ng-hide="connecting">
- <div class="col-xs-1"></div>
- <div class="col-xs-10">
- <div class="alert alert-success">
- <p>
- Enter the address and a HTML-enabled port of a <strong><a href="http://qpid.apache.org/components/dispatch-router/" target="_blank">Qpid Dispatch Router</a></strong>.
- </p>
- <!--
- <p>
- If Autostart is checked, you will be automatically logged in to the router the next time you start the console.
- </p> -->
-
- </div>
- <div class="connect-form">
- <form class="form-horizontal no-bottom-margin" novalidate ng-submit="connect()" name="settings">
- <div class="form-group">
- <label class="col-md-2 control-label" for="address">Address: </label>
- <div class="col-md-6">
- <input tabindex="1" id="address" type="text" ng-model="formEntity.address" placeholder="localhost" name="address" autofocus="autofocus" class="ng-pristine ng-valid ng-valid-required"></div>
- </div>
- <div class="form-group">
- <label tabindex="-1" class="col-md-2 control-label" title="Ports to connect to, by default 5673" for="port">Port: </label>
- <div class="col-md-6">
- <input tabindex="2" id="port" posint type="number" placeholder="5673" tooltip="Ports to connect to, by default 5673" ng-model="formEntity.port" name="port" title="Ports to connect to, by default 5673">
- <span ng-show="settings.port.$error.range">Must be 1 through 65535</span>
- </div>
- </div>
- <div class="form-group">
- <label tabindex="-1" class="col-md-2 control-label" title="User name" for="username">User name: </label>
- <div class="col-md-6">
- <input tabindex="3" id="username" type="text" placeholder="username" tooltip="User name" ng-model="formEntity.username" name="username" title="User name">
- </div>
- </div>
- <div class="form-group">
- <label tabindex="-1" class="col-md-2 control-label" title="Password" for="password">Password: </label>
- <div class="col-md-6">
- <input tabindex="4" id="password" type="password" placeholder="password" tooltip="Password" ng-model="formEntity.password" name="password" title="Password">
- </div>
- </div>
-<!--
- <div class="form-group">
- <label tabindex="-1" class="col-md-2 control-label" title="Whether or not the connection should be started as soon as you log in" for="autostart">Autostart: </label>
- <div class="col-md-6">
- <input tabindex="3" id="autostart" type="checkbox" tooltip="Whether or not the connection should be started as soon as you log into hawtio" ng-model="formEntity.autostart" name="autostart" title="Whether or not the connection should be started as soon as you log into hawtio"
- class="ng-scope ng-pristine ng-valid"></div>
- </div>
--->
- <input tabindex="-1" type="submit" style="position: absolute; left: -9999px; width: 1px; height: 1px;">
- <p></p>
- <div class="form-group">
- <label tabindex="-1" class="col-md-2 control-label" title="button"></label>
- <div class="col-md-6">
- <button type="submit" tabindex="4" class="btn btn-primary pull-left" ng-disabled="settings.$invalid">{{buttonText()}}</button>
- </div>
- </div>
- </form>
-
-
- </div>
- </div>
- <div class="col-xs-1"></div>
- </div>
-
- <div class="centered" ng-show="connecting">
- <i class="icon-spin icon-spinner icon-4x"></i>
- <p>Please wait, connecting now...</p>
- </div>
- <div class="centered error" ng-show="connectionError">
- <p>There was a connection error: {{connectionErrorText}}</p>
- </div>
-
-</div>
-
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/html/qdrTopology.html
----------------------------------------------------------------------
diff --git a/console/test/html/qdrTopology.html b/console/test/html/qdrTopology.html
deleted file mode 100644
index 403a66c..0000000
--- a/console/test/html/qdrTopology.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<div class="qdrTopology row-fluid" ng-controller="QDR.TopologyController">
- <div class="qdr-topology pane left" ng-controller="QDR.TopologyFormController">
- <div id="topologyForm" ng-class="{selected : isSelected()}">
- <!-- <div ng-repeat="form in forms" ng-show="isVisible(form)" ng-class='{selected : isSelected(form)}'> -->
- <div ng-show="form == 'router'">
- <h4>Router Info</h4>
- <div class="gridStyle" ng-grid="topoGridOptions"></div>
- </div>
- <div ng-show="form == 'connection'">
- <h4>Connection Info</h4>
- <div class="gridStyle" ng-grid="topoGridOptions"></div>
- </div>
- <div id="addNodeForm" ng-show="form == 'add'">
- <h4>Add a new router</h4>
- <ul>
- <li>Click on an existing router to create a connection to the new router</li>
- <li>Double-click on the new router to <button ng-click="editNewRouter()">edit</button> its properties</li>
- <li ng-show="addingNode.hasLink" >Right-click on a new connection to edit its properties</li>
- </ul>
- <button ng-click="cancel()">Cancel</button>
- </div>
- </div>
- <button ng-if="panelVisible" ng-click="hideLeftPane()" class="hideLeft" title="Hide"><i class="icon-step-backward"></i></button>
- <button ng-if="!panelVisible" ng-click="showLeftPane()" class="hideLeft" title="Show"><i class="icon-step-forward"></i></button>
- </div>
- <div class="panel-adjacent">
- <div id="buttonBar">
- <button class="btn btn-primary" type="button" ng-click="Publish()">Publish</button>
- <button class="btn btn-primary" type="button" ng-click="Duplicate()">Duplicate</button>
- <button class="btn btn-primary" type="button" ng-click="Clear()">Clear</button>
- <select ng-model="mockTopologyDir" ng-options="item for item in mockTopologies"></select>
- <button class="btn btn-primary" type="button" ng-click="settings()">Settings</button>
- </div>
- <!--
- <ul class="nav nav-tabs ng-scope qdrTopoModes">
- <li ng-repeat="mode in modes" ng-class="{active : isModeActive(mode.name), 'pull-right' : isRight(mode)}" ng-click="selectMode('{{mode.name}}')" >
- <a data-placement="bottom" class="ng-binding"> {{mode.name}} </a></li>
- </ul>
--->
- <div id="topology" ng-show="mode == 'Diagram'"><!-- d3 toplogy here --></div>
- <div id="geology" ng-show="mode == 'Globe'"><!-- d3 globe here --></div>
- <div id="crosssection"><!-- d3 pack here --></div>
- <!-- <div id="addRouter" ng-show="mode == 'Add Node'"></div> -->
- <div id="node_context_menu" class="contextMenu">
- <ul>
- <li class="na" ng-class="{'force-display': !isFixed()}" ng-click="setFixed(true)">Freeze in place</li>
- <li class="na" ng-class="{'force-display': isFixed()}" ng-click="setFixed(false)">Unfreeze</li>
- <li ng-class="{'na': contextNode.nodeType !== 'inter-router'}" class="context-separator"></li>
- <li ng-class="{'na': contextNode.nodeType !== 'inter-router'}" ng-click="addToNode('sender')">Add a sender</li>
- <li ng-class="{'na': contextNode.nodeType !== 'inter-router'}" ng-click="addToNode('receiver')">Add a receiver</li>
- <li ng-class="{'na': contextNode.nodeType !== 'inter-router'}" ng-click="addToNode('both')">Add a sender/receiver</li>
- <li ng-class="{'na': contextNode.nodeType !== 'inter-router'}" ng-click="addToNode('console')">Add a console</li>
- <li ng-class="{'na': contextNode.nodeType !== 'inter-router'}" class="context-separator"></li>
- <li ng-class="{'na': contextNode.nodeType !== 'inter-router'}" ng-click="addToNode('Artemis')">Add an Artemis broker</li>
- <li ng-class="{'na': contextNode.nodeType !== 'inter-router'}" ng-click="addToNode('Qpid')">Add a Qpid broker</li>
- <li ng-class="{'na': contextNode.nodeType !== 'inter-router'}" class="context-separator"></li>
- <li ng-click="delNode()">Delete this node</li>
- </ul>
- </div>
- <div id="svg_context_menu" class="contextMenu">
- <ul>
- <li ng-click="addAnotherNode()">Add a new router</li>
- </ul>
- </div>
- <div id="link_context_menu" class="contextMenu">
- <ul>
- <li ng-click="reverseLink()">Reverse connection direction</li>
- <li ng-click="removeLink()">Remove connection</li>
- </ul>
- </div>
- <div id="svg_legend"></div>
- </div>
-</div>
-
-
-<script type="text/ng-template" id="titleHeaderCellTemplate.html">
- <div title="{{col.displayName}}" class="ngHeaderSortColumn {{col.headerClass}}" ng-style="{'cursor': col.cursor}" ng-class="{ 'ngSorted': !noSortVisible }">
- <div ng-click="col.sort($event)" ng-class="'colt' + col.index" class="ngHeaderText">{{col.displayName}}</div>
- <div class="ngSortButtonDown" ng-show="col.showSortButtonDown()"></div>
- <div class="ngSortButtonUp" ng-show="col.showSortButtonUp()"></div>
- <div class="ngSortPriority">{{col.sortPriority}}</div>
- </div>
-</script>
-<script type="text/ng-template" id="titleCellTemplate.html">
- <div title="{{row.entity[col.field]}}" class="ngCellText">{{row.entity[col.field]}}</div>
-</script>
-
-<!--
- This is the template for the node edit dialog that is displayed.
--->
-<script type="text/ng-template" id="node-config-template.html">
- <div class="modal-header">
- <h3 class="modal-title">Configure new routers/clients</h3>
- </div>
- <div class="modal-body">
- <form novalidate name="editForm">
-
- <div class="entity-description">{{entity.description}}</div>
- <fieldset>
- <div ng-repeat="attribute in entity.attributes">
- <label for="{{attribute.name}}">{{attribute.humanName}}</label>
-<!-- we can't do <input type="{angular expression}"> because... jquery throws an exception because... -->
- <div ng-if="attribute.input == 'input'">
- <!-- ng-pattern="testPattern(attribute)" -->
- <input ng-if="attribute.type == 'number'" type="number" name="{{attribute.name}}" id="{{attribute.name}}" ng-model="attribute.value" ng-required="attribute.required" class="ui-widget-content ui-corner-all"/>
- <input ng-if="attribute.type == 'text'" type="text" name="{{attribute.name}}" id="{{attribute.name}}" ng-model="attribute.value" ng-required="attribute.required" class="ui-widget-content ui-corner-all"/>
- </div>
- <div ng-if="attribute.input == 'select'">
- <select id="{{attribute.name}}" ng-model="attribute.selected" ng-options="item for item in attribute.rawtype"></select>
- </div>
- <div ng-if="attribute.input == 'boolean'" class="boolean">
- <label><input type="radio" ng-model="attribute.value" value="true"> True</label>
- <label><input type="radio" ng-model="attribute.value" value="false"> False</label>
- </div>
- </div>
- </fieldset>
-
- </form>
- </div>
- <div class="modal-footer">
- <button class="btn btn-primary" type="button" ng-click="setSettings()">OK</button>
- <button class="btn btn-warning" type="button" ng-click="cancel()">Cancel</button>
- </div>
-</script>
-
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/index.html
----------------------------------------------------------------------
diff --git a/console/test/index.html b/console/test/index.html
deleted file mode 100644
index 0545aa7..0000000
--- a/console/test/index.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html xmlns:ng="http://angularjs.org">
-
-<head>
-
- <meta charset="utf-8"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <title>Qpid Dispatch Console</title>
-
- <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
- <link rel="stylesheet" href="https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.css">
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery.tipsy/1.0.2/jquery.tipsy.css" type="text/css"/>
- <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ng-grid/2.0.11/ng-grid.min.css" type="text/css"/>
- <link rel="stylesheet" href="https://cdn.rawgit.com/mar10/dynatree/master/dist/skin/ui.dynatree.css" type="text/css">
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap-combined.min.css" type="text/css">
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.min.css">
-
- <link rel="stylesheet" href="css/plugin.css" type="text/css"/>
- <link rel="stylesheet" href="css/dispatch.css" type="text/css"/>
- <link rel="stylesheet" href="css/site-base.css" type="text/css"/>
- <link rel="stylesheet" href="css/mock.css" type="text/css"/>
- <link rel="stylesheet" href="https://cdn.rawgit.com/mohsen1/json-formatter/master/dist/json-formatter.min.css" type="text/css"/>
-
-</head>
-
-<body ng-app="QDR">
-
-<div id="core" ng-controller="QDR.Core">
- <div id="alerts">
- <uib-alert ng-repeat="alert in alerts" type="{{alert.type}}">{{alert.msg}}</uib-alert>
- </div>
- <div id="main-nav" class="navbar navbar-fixed-top" ng-controller="QDR.MainController">
- <div class="navbar-inner main-nav-lower">
- <div class="container">
- <div class="pull-left">
- <ul class="nav">
- <li ng-repeat="nav in topLevelTabs track by $index"
- ng-class="{active : !nav.isActive()}"
- ng-show="nav.isValid()">
- <a ng-href="{{nav.href}}" title="{{nav.title}}" data-placement="bottom" ng-bind="nav.content">
- </a>
- </li>
- </ul>
- </div>
- </div>
- </div>
- </div>
-
- <div id="main-body" >
- <div id="main" class="container-fluid ng-cloak qdr">
- <div ng-include src="'html/qdrLayout.html'"></div>
- </div>
- </div>
-</div>
-
-<!-- <script src="http://d3js.org/d3.v3.min.js"></script>
- <script src="http://d3js.org/queue.v1.min.js"></script> -->
- <script src='https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.14/d3.min.js'></script>
- <script src='https://cdnjs.cloudflare.com/ajax/libs/d3-queue/3.0.3/d3-queue.min.js'></script>
-
- <script src="http://d3js.org/topojson.v0.min.js"></script>
-
- <script src="http://code.jquery.com/jquery-1.8.3.min.js"></script>
-
- <script src="https://maxcdn.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js"></script>
-
- <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular.min.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular-sanitize.min.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular-resource.min.js"></script>
-
- <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.4.0/ui-bootstrap-tpls.min.js"></script>
-
- <script src="https://cdn.rawgit.com/jaz303/tipsy/master/src/javascripts/jquery.tipsy.js"></script>
- <script src="https://cdn.rawgit.com/briancray/tooltipsy/master/tooltipsy.min.js"></script>
- <script src="https://cdn.rawgit.com/angular-ui/ui-slider/master/src/slider.js"></script>
- <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/ng-grid/2.0.11/ng-grid.min.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/notify/0.4.2/notify.min.js"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/2014-11-29/FileSaver.min.js"></script>
-
- <script type="text/javascript" src="js/dispatchPlugin.js"></script>
- <script type="text/javascript" src="js/navbar.js"></script>
- <script type="text/javascript" src="js/qdrService.js"></script>
- <script type="text/javascript" src="js/qdrTopology.js"></script>
- <script type="text/javascript" src="js/qdrSettings.js"></script>
-
- <script type="text/javascript" src="lib/rhea-min.js"></script>
-
- <script src="https://cdn.rawgit.com/mar10/dynatree/master/dist/jquery.dynatree.min.js"></script>
-
- <script type="text/javascript">
- angular.element(document.getElementsByTagName('head')).append(angular.element('<base href="' + window.location.pathname + '" />'));
- </script>
-</body>
-</html>
-
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/js/dispatchPlugin.js
----------------------------------------------------------------------
diff --git a/console/test/js/dispatchPlugin.js b/console/test/js/dispatchPlugin.js
deleted file mode 100644
index b30d9c1..0000000
--- a/console/test/js/dispatchPlugin.js
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-/**
- * @module QDR
- * @main QDR
- *
- * The main entry point for the QDR module
- *
- */
-var QDR = (function(QDR) {
-
- /**
- * @property pluginName
- * @type {string}
- *
- * The name of this plugin
- */
- QDR.pluginName = "QDR";
- QDR.pluginRoot = "";
- QDR.isStandalone = true;
-
- /**
- * @property log
- * @type {Logging.Logger}
- *
- * This plugin's logger instance
- */
- //HIO QDR.log = Logger.get(QDR.pluginName);
- /**
- * @property templatePath
- * @type {string}
- *
- * The top level path to this plugin's partials
- */
- QDR.srcBase = "";
- QDR.templatePath = QDR.srcBase + "html/";
- QDR.cssPath = QDR.srcBase + "css/";
- /**
- * @property SETTINGS_KEY
- * @type {string}
- *
- * The key used to fetch our settings from local storage
- */
- QDR.SETTINGS_KEY = 'QDRSettings';
- QDR.LAST_LOCATION = "QDRLastLocation";
-
- /**
- * @property module
- * @type {object}
- *
- * This plugin's angularjs module instance
- */
- QDR.module = angular.module(QDR.pluginName, ['ngResource', 'ngGrid', 'ui.bootstrap', 'ui.slider'/*, 'minicolors' */]);
-
- Core = {
- notification: function (severity, msg) {
- $.notify(msg, severity);
- }
- }
-
- // set up the routing for this plugin
- QDR.module.config(function($routeProvider) {
- $routeProvider
- .when('/', {
- templateUrl: QDR.templatePath + 'qdrConnect.html'
- })
- .when('/topology', {
- templateUrl: QDR.templatePath + 'qdrTopology.html'
- })
- .when('/connect', {
- templateUrl: QDR.templatePath + 'qdrConnect.html'
- })
- .otherwise({
- templateUrl: QDR.templatePath + 'qdrConnect.html'
- })
- });
-
- QDR.module.config(function ($compileProvider) {
- var cur = $compileProvider.urlSanitizationWhitelist();
- $compileProvider.urlSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|blob):/);
- cur = $compileProvider.urlSanitizationWhitelist();
- })
-
- QDR.module.filter('to_trusted', ['$sce', function($sce){
- return function(text) {
- return $sce.trustAsHtml(text);
- };
- }]);
-
- QDR.module.filter('humanify', function (QDRService) {
- return function (input) {
- return QDRService.humanify(input);
- };
- });
-
- QDR.module.filter('Pascalcase', function () {
- return function (str) {
- if (!str)
- return "";
- return str.replace(/(\w)(\w*)/g,
- function(g0,g1,g2){return g1.toUpperCase() + g2.toLowerCase();});
- }
- })
-
- QDR.module.filter('safePlural', function () {
- return function (str) {
- var es = ['x', 'ch', 'ss', 'sh']
- for (var i=0; i<es.length; ++i) {
- if (str.endsWith(es[i]))
- return str + 'es'
- }
- if (str.endsWith('y'))
- return str.substr(0, str.length-2) + 'ies'
- if (str.endsWith('s'))
- return str;
- return str + 's'
- }
- })
-
- QDR.logger = function ($log) {
- var log = $log;
-
- this.debug = function (msg) { msg = "QDR: " + msg; log.debug(msg)};
- this.error = function (msg) {msg = "QDR: " + msg; log.error(msg)}
- this.info = function (msg) {msg = "QDR: " + msg; log.info(msg)}
- this.warn = function (msg) {msg = "QDR: " + msg; log.warn(msg)}
-
- return this;
- }
- // one-time initialization happens in the run function
- // of our module
- QDR.module.run( ["$rootScope", '$route', '$timeout', "$location", "$log", "QDRService", function ($rootScope, $route, $timeout, $location, $log, QDRService) {
- QDR.log = new QDR.logger($log);
- QDR.log.info("*************creating Dispatch Console************");
- var curPath = $location.path()
- var org = curPath.substr(1)
- if (org && org.length > 0 && org !== "connect") {
- $location.search('org', org)
- } else {
- $location.search('org', null)
- }
- QDR.queue = d3.queue;
-
- QDRService.initProton();
- var settings = angular.fromJson(localStorage[QDR.SETTINGS_KEY]);
- if (settings && settings.autostart) {
- QDRService.addDisconnectAction( function () {
- $timeout(function () {
- var lastLocation = localStorage[QDR.LAST_LOCATION] || "/overview";
- org = lastLocation.substr(1)
- $location.path("/connect");
- $location.search('org', org)
- })
- })
- QDRService.addConnectAction(function() {
- QDRService.getSchema(function () {
- QDR.log.debug("got schema after connection")
-/*
- QDRService.addUpdatedAction("initialized", function () {
- QDRService.delUpdatedAction("initialized")
- QDR.log.debug("got initial topology")
- $timeout(function() {
- if ($location.path().startsWith(QDR.pluginRoot)) {
- var searchObject = $location.search();
- var goto = "overview";
- if (searchObject.org && searchObject.org !== "connect") {
- goto = searchObject.org;
- }
- $location.search('org', null)
- $location.path(QDR.pluginRoot + "/" + goto);
- }
- })
- })
- QDR.log.debug("requesting a topology")
- QDRService.setUpdateEntities([])
- QDRService.topology.get()
-*/
- })
- });
- QDRService.connect(settings);
- } else {
- $timeout(function () {
- $location.path('/connect')
- $location.search('org', org)
- })
- }
-
- $rootScope.$on('$routeChangeSuccess', function() {
- var path = $location.path();
- if (path !== "/connect") {
- localStorage[QDR.LAST_LOCATION] = path;
- }
- });
-
- }]);
-
- QDR.module.controller ("QDR.MainController", ['$scope', '$location', function ($scope, $location) {
- QDR.log.debug("started QDR.MainController with location.url: " + $location.url());
- QDR.log.debug("started QDR.MainController with window.location.pathname : " + window.location.pathname);
- $scope.topLevelTabs = [];
- $scope.topLevelTabs.push({
- id: "qdr",
- content: "Qpid Dispatch Router Console Test Data Creator",
- title: "Dispatch Router Console",
- isValid: function() { return true; },
- href: function() { return "#connect"; },
- isActive: function() { return true; }
- });
- }])
-
- QDR.module.controller ("QDR.Core", function ($scope, $rootScope) {
- $scope.alerts = [];
- $scope.closeAlert = function(index) {
- $scope.alerts.splice(index, 1);
- };
- $scope.$on('newAlert', function(event, data) {
- $scope.alerts.push(data);
- $scope.$apply();
- });
- $scope.$on("clearAlerts", function () {
- $scope.alerts = [];
- $scope.$apply();
- })
-
- })
-
- return QDR;
-}(QDR || {}));
-
-var Folder = (function () {
- function Folder(title) {
- this.title = title;
- this.children = [];
- this.folder = true;
- }
- return Folder;
-})();
-var Leaf = (function () {
- function Leaf(title) {
- this.title = title;
- }
- return Leaf;
-})();
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/js/navbar.js
----------------------------------------------------------------------
diff --git a/console/test/js/navbar.js b/console/test/js/navbar.js
deleted file mode 100644
index dba74ec..0000000
--- a/console/test/js/navbar.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-/**
- * @module QDR
- */
-var QDR = (function (QDR) {
-
- /**
- * @property breadcrumbs
- * @type {{content: string, title: string, isValid: isValid, href: string}[]}
- *
- * Data structure that defines the sub-level tabs for
- * our plugin, used by the navbar controller to show
- * or hide tabs based on some criteria
- */
- QDR.breadcrumbs = [
- {
- content: '<i class="icon-cogs"></i> Connect',
- title: "Connect to a router",
- isValid: function () { return true; },
- href: "#" + QDR.pluginRoot + "/connect"
- },
- {
- content: '<i class="icon-star-empty"></i> Topology',
- title: "View router network topology",
- isValid: function (QDRService) { return QDRService.isConnected(); },
- href: "#" + QDR.pluginRoot + "/topology"
- },
- ];
- /**
- * @function NavBarController
- *
- * @param $scope
- * @param workspace
- *
- * The controller for this plugin's navigation bar
- *
- */
- QDR.module.controller("QDR.NavBarController", ['$scope', 'QDRService', '$routeParams', '$location', function($scope, QDRService, $routeParams, $location) {
- $scope.breadcrumbs = QDR.breadcrumbs;
- $scope.isValid = function(link) {
- return link.isValid(QDRService, $location);
- };
-
- $scope.isActive = function(href) {
- // highlight the connect tab if we are on the root page
- if (($location.path() === QDR.pluginRoot) && (href.split("#")[1] === QDR.pluginRoot + "/connect"))
- return true
- return href.split("#")[1] == $location.path();
- };
-
- $scope.isRight = function (link) {
- return angular.isDefined(link.right);
- };
-
- }]);
-
-
- return QDR;
-
-} (QDR || {}));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/5] qpid-dispatch git commit: DISPATCH-989 Removing this testing
tool
Posted by ea...@apache.org.
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/js/qdrService.js
----------------------------------------------------------------------
diff --git a/console/test/js/qdrService.js b/console/test/js/qdrService.js
deleted file mode 100644
index f4effdd..0000000
--- a/console/test/js/qdrService.js
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-'use strict';
-/* global Promise */
-/**
- * @module QDR
- */
-var QDR = (function(QDR) {
-
- // The QDR service handles the connection to the router
- QDR.module.factory('QDRService', ['$timeout', '$location', function($timeout, $location) {
- let dm = require('dispatch-management');
- let self = {
- management: new dm.Management($location.protocol()),
- utilities: dm.Utilities,
-
- onReconnect: function () {
- self.management.connection.on('disconnected', self.onDisconnect);
- let org = localStorage[QDR.LAST_LOCATION] || '/overview';
- $timeout ( function () {
- $location.path(org);
- $location.search('org', null);
- $location.replace();
- });
- },
- onDisconnect: function () {
- self.management.connection.on('connected', self.onReconnect);
- $timeout( function () {
- $location.path('/connect');
- let curPath = $location.path();
- let parts = curPath.split('/');
- let org = parts[parts.length-1];
- if (org && org.length > 0 && org !== 'connect') {
- $location.search('org', org);
- } else {
- $location.search('org', null);
- }
- $location.replace();
- });
- },
-
- connect: function (connectOptions) {
- return new Promise ( function (resolve, reject) {
- self.management.connection.connect(connectOptions)
- .then( function (r) {
- // if we are ever disconnected, show the connect page and wait for a reconnect
- self.management.connection.on('disconnected', self.onDisconnect);
-
- self.management.getSchema()
- .then( function () {
- QDR.log.info('got schema after connection');
- self.management.topology.setUpdateEntities([]);
- QDR.log.info('requesting a topology');
- self.management.topology.get() // gets the list of routers
- .then( function () {
- QDR.log.info('got initial topology');
- let curPath = $location.path();
- let parts = curPath.split('/');
- let org = parts[parts.length-1];
- if (org === '' || org === 'connect') {
- org = localStorage[QDR.LAST_LOCATION] || QDR.pluginRoot + '/overview';
- }
- $timeout ( function () {
- $location.path(org);
- $location.search('org', null);
- $location.replace();
- });
- });
- });
- resolve(r);
- }, function (e) {
- reject(e);
- });
- });
- },
- disconnect: function () {
- self.management.connection.disconnect();
- delete self.management;
- self.management = new dm.Management($location.protocol());
- }
-
-
- };
-
- return self;
- }]);
-
- return QDR;
-
-}(QDR || {}));
-
-(function() {
- console.dump = function(o) {
- if (window.JSON && window.JSON.stringify)
- QDR.log.info(JSON.stringify(o, undefined, 2));
- else
- console.log(o);
- };
-})();
-
-if (!String.prototype.startsWith) {
- String.prototype.startsWith = function (searchString, position) {
- return this.substr(position || 0, searchString.length) === searchString;
- };
-}
-
-if (!String.prototype.endsWith) {
- String.prototype.endsWith = function(searchString, position) {
- let subjectString = this.toString();
- if (typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > subjectString.length) {
- position = subjectString.length;
- }
- position -= searchString.length;
- let lastIndex = subjectString.lastIndexOf(searchString, position);
- return lastIndex !== -1 && lastIndex === position;
- };
-}
-
-// https://tc39.github.io/ecma262/#sec-array.prototype.findIndex
-if (!Array.prototype.findIndex) {
- Object.defineProperty(Array.prototype, 'findIndex', {
- value: function(predicate) {
- // 1. Let O be ? ToObject(this value).
- if (this == null) {
- throw new TypeError('"this" is null or not defined');
- }
-
- let o = Object(this);
-
- // 2. Let len be ? ToLength(? Get(O, "length")).
- let len = o.length >>> 0;
-
- // 3. If IsCallable(predicate) is false, throw a TypeError exception.
- if (typeof predicate !== 'function') {
- throw new TypeError('predicate must be a function');
- }
-
- // 4. If thisArg was supplied, let T be thisArg; else let T be undefined.
- let thisArg = arguments[1];
-
- // 5. Let k be 0.
- let k = 0;
-
- // 6. Repeat, while k < len
- while (k < len) {
- // a. Let Pk be ! ToString(k).
- // b. Let kValue be ? Get(O, Pk).
- // c. Let testResult be ToBoolean(? Call(predicate, T, « kValue, k, O »)).
- // d. If testResult is true, return k.
- let kValue = o[k];
- if (predicate.call(thisArg, kValue, k, o)) {
- return k;
- }
- // e. Increase k by 1.
- k++;
- }
-
- // 7. Return -1.
- return -1;
- }
- });
-}
-
-// https://tc39.github.io/ecma262/#sec-array.prototype.find
-if (!Array.prototype.find) {
- Object.defineProperty(Array.prototype, 'find', {
- value: function(predicate) {
- // 1. Let O be ? ToObject(this value).
- if (this == null) {
- throw new TypeError('"this" is null or not defined');
- }
-
- let o = Object(this);
-
- // 2. Let len be ? ToLength(? Get(O, "length")).
- let len = o.length >>> 0;
-
- // 3. If IsCallable(predicate) is false, throw a TypeError exception.
- if (typeof predicate !== 'function') {
- throw new TypeError('predicate must be a function');
- }
-
- // 4. If thisArg was supplied, let T be thisArg; else let T be undefined.
- let thisArg = arguments[1];
-
- // 5. Let k be 0.
- let k = 0;
-
- // 6. Repeat, while k < len
- while (k < len) {
- // a. Let Pk be ! ToString(k).
- // b. Let kValue be ? Get(O, Pk).
- // c. Let testResult be ToBoolean(? Call(predicate, T, « kValue, k, O »)).
- // d. If testResult is true, return kValue.
- let kValue = o[k];
- if (predicate.call(thisArg, kValue, k, o)) {
- return kValue;
- }
- // e. Increase k by 1.
- k++;
- }
-
- // 7. Return undefined.
- return undefined;
- }
- });
-}
-
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill
-if (!Array.prototype.fill) {
- Object.defineProperty(Array.prototype, 'fill', {
- value: function(value) {
-
- // Steps 1-2.
- if (this == null) {
- throw new TypeError('this is null or not defined');
- }
-
- var O = Object(this);
-
- // Steps 3-5.
- var len = O.length >>> 0;
-
- // Steps 6-7.
- var start = arguments[1];
- var relativeStart = start >> 0;
-
- // Step 8.
- var k = relativeStart < 0 ?
- Math.max(len + relativeStart, 0) :
- Math.min(relativeStart, len);
-
- // Steps 9-10.
- var end = arguments[2];
- var relativeEnd = end === undefined ?
- len : end >> 0;
-
- // Step 11.
- var final = relativeEnd < 0 ?
- Math.max(len + relativeEnd, 0) :
- Math.min(relativeEnd, len);
-
- // Step 12.
- while (k < final) {
- O[k] = value;
- k++;
- }
-
- // Step 13.
- return O;
- }
- });
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/js/qdrSettings.js
----------------------------------------------------------------------
diff --git a/console/test/js/qdrSettings.js b/console/test/js/qdrSettings.js
deleted file mode 100644
index 5ee6be2..0000000
--- a/console/test/js/qdrSettings.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-/**
- * @module QDR
- */
-var QDR = (function(QDR) {
-
- /**
- * @method SettingsController
- * @param $scope
- * @param QDRServer
- *
- * Controller that handles the QDR settings page
- */
-
- QDR.module.controller("QDR.SettingsController", ['$scope', 'QDRService', '$timeout', '$location', function($scope, QDRService, $timeout, $location) {
-
- $scope.connecting = false;
- $scope.connectionError = false;
- $scope.connectionErrorText = undefined;
- $scope.forms = {};
-
- $scope.formEntity = angular.fromJson(localStorage[QDR.SETTINGS_KEY]) || {
- address: '',
- port: '',
- username: '',
- password: '',
- autostart: false
- };
-
- $scope.$watch('formEntity', function(newValue, oldValue) {
- if (newValue !== oldValue) {
- localStorage[QDR.SETTINGS_KEY] = angular.toJson(newValue);
- }
- }, true);
-
- $scope.buttonText = function() {
- if (QDRService.isConnected()) {
- return "Disconnect";
- } else {
- return "Connect";
- }
- };
-
- $scope.connect = function() {
- if (QDRService.connected) {
- QDRService.disconnect();
- return;
- }
-
- if ($scope.settings.$valid) {
- $scope.connectionError = false;
- $scope.connecting = true;
- $timeout(doConnect) // timeout so connecting animation can display
- }
- }
-
- var doConnect = function() {
- if (!$scope.formEntity.address)
- $scope.formEntity.address = "localhost"
-
- console.log("attempting to connect to " + $scope.formEntity.address + ':' + $scope.formEntity.port);
- QDRService.addDisconnectAction(function() {
- $timeout(function() {
- QDR.log.debug("disconnect action called");
- $scope.connecting = false;
- $scope.connectionErrorText = QDRService.errorText;
- $scope.connectionError = true;
- })
- });
- QDRService.addConnectAction(function() {
- QDRService.getSchema(function () {
- QDR.log.debug("got schema after connection")
-
- $timeout(function () {
- $scope.connecting = false;
- $location.search('org', null)
- $location.path(QDR.pluginRoot + "/topology");
- })
-
-/*
-
- QDRService.addUpdatedAction("initialized", function () {
- QDRService.delUpdatedAction("initialized")
- QDR.log.debug("got initial topology")
- $timeout(function() {
-QDR.log.debug("changing location to ")
- $scope.connecting = false;
- $location.search('org', null)
- $location.path(QDR.pluginRoot + "/topology");
- })
- })
- QDR.log.debug("requesting a topology")
- QDRService.setUpdateEntities([])
- QDRService.topology.get()
-*/
- })
- });
- QDRService.connect($scope.formEntity);
- }
-
- }]);
-
-
- QDR.module.directive('posint', function() {
- return {
- require: 'ngModel',
-
- link: function(scope, elem, attr, ctrl) {
- // input type number allows + and - but we don't want them so filter them out
- elem.bind('keypress', function(event) {
- var nkey = !event.charCode ? event.which : event.charCode;
- var skey = String.fromCharCode(nkey);
- var nono = "-+.,"
- if (nono.indexOf(skey) >= 0) {
- event.preventDefault();
- return false;
- }
- // firefox doesn't filter out non-numeric input. it just sets the ctrl to invalid
- if (/[\!\@\#\$\%^&*\(\)]/.test(skey) && event.shiftKey || // prevent shift numbers
- !( // prevent all but the following
- nkey <= 0 || // arrows
- nkey == 8 || // delete|backspace
- nkey == 13 || // enter
- (nkey >= 37 && nkey <= 40) || // arrows
- event.ctrlKey || event.altKey || // ctrl-v, etc.
- /[0-9]/.test(skey)) // numbers
- ) {
- event.preventDefault();
- return false;
- }
- })
- // check the current value of input
- var _isPortInvalid = function(value) {
- var port = value + ''
- var isErrRange = false;
- // empty string is valid
- if (port.length !== 0) {
- var n = ~~Number(port);
- if (n < 1 || n > 65535) {
- isErrRange = true;
- }
- }
- ctrl.$setValidity('range', !isErrRange)
- return isErrRange;
- }
-
- //For DOM -> model validation
- ctrl.$parsers.unshift(function(value) {
- return _isPortInvalid(value) ? undefined : value;
- });
-
- //For model -> DOM validation
- ctrl.$formatters.unshift(function(value) {
- _isPortInvalid(value);
- return value;
- });
- }
- };
- });
-
- return QDR;
-}(QDR || {}));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/5] qpid-dispatch git commit: DISPATCH-989 Removing this testing
tool
Posted by ea...@apache.org.
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/mock/entities.py
----------------------------------------------------------------------
diff --git a/console/test/mock/entities.py b/console/test/mock/entities.py
deleted file mode 100644
index b20538d..0000000
--- a/console/test/mock/entities.py
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/usr/bin/env python
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import json
-from proton import generate_uuid
-import collections
-
-class Schema(object):
- schema = {}
-
- @staticmethod
- def i(entity, attribute):
- return Schema.schema[entity]["attributeNames"].index(attribute)
-
- @staticmethod
- def type(entity):
- return Schema.schema[entity]["fullyQualifiedType"]
-
- @staticmethod
- def init():
- with open("topologies/schema.json") as fp:
- data = json.load(fp)
- for entity in data["entityTypes"]:
- Schema.schema[entity] = {"attributeNames": [],
- "fullyQualifiedType": data["entityTypes"][entity]["fullyQualifiedType"]}
- for attribute in data["entityTypes"][entity]["attributes"]:
- Schema.schema[entity]["attributeNames"].append(attribute)
- Schema.schema[entity]["attributeNames"].append("type")
-
-class SparseList(list):
- '''
- from http://stackoverflow.com/questions/1857780/sparse-assignment-list-in-python
- '''
- def __setitem__(self, index, value):
- missing = index - len(self) + 1
- if missing > 0:
- self.extend([None] * missing)
- list.__setitem__(self, index, value)
- def __getitem__(self, index):
- try: return list.__getitem__(self, index)
- except IndexError: return None
-
-class Entity(object):
- def __init__(self, name):
- self.name = name
- self.value = SparseList()
- self.settype()
-
- def setval(self, attribute, value):
- self.value[Schema.i(self.name, attribute)] = value
-
- def settype(self):
- self.setval("type", Schema.type(self.name))
-
- def setZero(self, attributes):
- for attribute in attributes:
- self.setval(attribute, 0)
-
- def getval(self, attr):
- return self.value[Schema.i(self.name, attr)]
-
- def vals(self):
- return self.value
-
-class Multiple(object):
- def __init__(self):
- self.results = []
-
- def vals(self):
- return self.results
-
-class RouterNode(Entity):
- instance = 0
- def __init__(self, f, t, links, hopper):
- super(RouterNode, self).__init__("router.node")
- self.hopper = hopper
- self.init(f, t, links)
-
- def init(self, f, t, links):
- RouterNode.instance += 1
- self.setval("name", "router.node/" + t)
- self.setval("nextHop", "(self)" if f == t else self.hopper.get(f, t, links))
- self.setval("validOrigins", [])
- self.setval("linkState", [])
- self.setval("instance", RouterNode.instance)
- self.setval("cost", 1)
- self.setval("address", "amqp:/_topo/0/" + t)
- self.setval("id", t)
- self.setval("identity", self.value[Schema.i(self.name, "name")])
-
- def reset(self):
- RouterNode.nh = NextHop()
-
-class Connector(Entity):
- def __init__(self, host, port):
- super(Connector, self).__init__("connector")
- self.init(host, port)
-
- def init(self, host, port):
- self.setval("verifyHostName", True)
- self.setval("cost", 1)
- self.setval("addr", "127.0.0.1")
- self.setval("maxSessions", 32768)
- self.setval("allowRedirect", True)
- self.setval("idleTimeoutSeconds", 16)
- self.setval("saslMechanisms", "AMONYMOUS")
- self.setval("maxFrameSize", 16384)
- self.setval("maxSessionFrames", 100)
- self.setval("host", host)
- self.setval("role", "inter-router")
- self.setval("stripAnnotations", "both")
- self.setval("port", port)
- self.setval("identity", "connector/" + host + ":" + port)
- self.setval("name", self.getval("identity"))
-
-class Policy(Entity):
- def __init__(self):
- super(Policy, self).__init__("policy")
- self.init()
-
- def init(self):
- self.setval("connectionsProcessed", 2)
- self.setval("defaultVhost", "$default")
- self.setval("connectionsDenied", 0)
- self.setval("enableVhostPolicy", False)
- self.setval("maxConnections", 65535)
- self.setval("connectionsCurrent", self.getval("connectionsProcessed"))
- self.setval("identity", 1)
- self.setval("name", "policy/" + str(self.getval("identity")))
-
-class Logs(Multiple):
- modules = ["AGENT", "CONTAINER", "DEFAULT", "ERROR", "MESSAGE", "POLICY", "ROUTER", "ROUTER_CORE", "ROUTER_HELLO",
- "ROUTER_LS", "ROUTER_MA", "SERVER"]
-
- def __init__(self):
- super(Logs, self).__init__()
- for module in Logs.modules:
- self.results.append(Log(module).vals())
-
-class Log(Entity):
- def __init__(self, module):
- super(Log, self).__init__("log")
- self.init(module)
-
- def init(self, module):
- self.setval("name", "log/" + module)
- self.setval("identity", self.getval("name"))
- self.setval("module", module)
-
-class Allocators(Multiple):
- names = [["qd_bitmask", 24], ["_buffer", 536], ["_composed_field", 64], ["_composite", 112], ["_connection", 232],
- ["_connector", 56], ["_deferred_call", 32], ["_field_iterator", 128], ["_hash_handle", 16],
- ["_hash_item", 32], ["_hash_segment", 24], ["_link", 48], ["_listener", 32], ["_log_entry", 2104],
- ["_management_context", 56], ["_message_context", 640], ["_message", 128], ["_node", 56],
- ["_parsed_field", 88], ["_timer", 56], ["_work_item", 24], ["pn_connector", 600], ["pn_listener", 48],
- ["r_action", 160], ["r_address_config", 56], ["r_address", 264], ["r_connection", 232],
- ["r_connection_work", 56], ["r_delivery_ref", 24], ["r_delivery", 144], ["r_field", 40],
- ["r_general_work", 64], ["r_link_ref", 24], ["r_link", 304], ["r_node", 64], ["r_query", 336],
- ["r_terminus", 64], ["tm_router", 16]]
-
- def __init__(self):
- super(Allocators, self).__init__()
- for name in Allocators.names:
- self.results.append(Allocator(name).vals())
-
-class Allocator(Entity):
- def __init__(self, name):
- super(Allocator, self).__init__("allocator")
- self.init(name)
-
- def init(self, name):
- n = "qd" + name[0] + "_t"
- self.setZero(["heldByThreads", "transferBatchSize", "globalFreeListMax", "batchesRebalancedToGlobal", "batchesRebalancedToThreads",
- "totalFreeToHeap", "totalAllocFromHeap", "localFreeListMax"])
- self.setval("name", "allocator/" + n)
- self.setval("identity", self.getval("name"))
- self.setval("typeName", n)
- self.setval("typeSize", name[1])
-
-class RouterAddresses(Multiple):
- def __init__(self, node, nodes):
- super(RouterAddresses, self).__init__()
-
- addresses = {}
- others = []
- for n in nodes:
- if n['nodeType'] == 'inter-router':
- if n['name'] != node['name']:
- self.results.append(RouterAddress("R"+n['name'], [n['name']], "closest", 0).vals())
- others.append(n['name'])
- else:
- for normal in n['normals']:
- nname = '.'.join(normal['name'].split('.')[:-1])
- if "console_identifier" not in node['properties']:
- maddr = "M0" + normal['addr']
- if maddr not in addresses:
- addresses[maddr] = []
- if nname != node['name']:
- if nname not in addresses[maddr]:
- addresses[maddr].append(nname)
-
- for address in addresses:
- self.results.append(RouterAddress(address, addresses[address], "balanced", 0).vals())
-
- self.results.append(RouterAddress("L_$management_internal", [], "closest", 1).vals())
- self.results.append(RouterAddress("M0$management", [], "closest", 1).vals())
- self.results.append(RouterAddress("L$management", [], "closest", 1).vals())
- self.results.append(RouterAddress("L$qdhello", [], "flood", 1).vals())
- self.results.append(RouterAddress("L$qdrouter", [], "flood", 1).vals())
- self.results.append(RouterAddress("L$qdrouter.ma", [], "multicast", 1).vals())
- self.results.append(RouterAddress("Tqdrouter", others, "flood", 1).vals())
- self.results.append(RouterAddress("Tqdrouter.ma", others, "multicast", 1).vals())
-
-class RouterAddress(Entity):
- def __init__(self, name, rhrList, distribution, inProcess):
- super(RouterAddress, self).__init__("router.address")
- self.init(name, rhrList, distribution, inProcess)
-
- def init(self, name, rhrList, distribution, inProcess):
- self.setZero(["subscriberCount", "deliveriesEgress", "deliveriesIngress",
- "deliveriesFromContainer", "deliveriesTransit", "containerCount",
- "trackedDeliveries", "deliveriesToContainer"])
- self.setval("name", name)
- self.setval("key", self.getval("name"))
- self.setval("distribution", distribution)
- self.setval("identity", self.getval("name"))
- self.setval("remoteHostRouters", rhrList)
- self.setval("remoteCount", len(rhrList))
- self.setval("inProcess", inProcess)
-
-class Address(Entity):
- def __init__(self):
- super(Address, self).__init__("address")
- self.init()
-
- def init(self):
- self.setval("egressPhase", 0)
- self.setval("ingressPhase", 0)
- self.setval("prefix", "closest")
- self.setval("waypoint", False)
- self.setval("distribution", "closest")
- self.setval("identity", 1)
- self.setval("name", "address/" + str(self.getval("identity")))
-
-class Router(Entity):
- def __init__(self, node):
- super(Router, self).__init__("router")
- self.init(node)
-
- def init(self, node):
- self.setval("mobileAddrMaxAge", 60)
- self.setval("raIntervalFlux", 4)
- self.setval("workerThreads", 4)
- self.setval("name", "router/" + node['name'])
- self.setval("helloInterval", 1)
- self.setval("area", 0)
- self.setval("helloMaxAge", 3)
- self.setval("remoteLsMaxAge", 60)
- self.setval("addrCount", 0)
- self.setval("raInterval", 30)
- self.setval("mode", "interior")
- self.setval("nodeCount", 0)
- self.setval("saslConfigName", "qdrouterd")
- self.setval("linkCount", 0)
- self.setval("id", node['name'])
- self.setval("identity", "router/" + node['name'])
-
-class Listener(Entity):
- def __init__(self, port):
- super(Listener, self).__init__("listener")
- self.init(port)
-
- def init(self, port):
- self.setval("stripAnnotations", "both")
- self.setval("requireSsl", False)
- self.setval("idleTimeoutSeconds", 16)
- self.setval("cost", 1)
- self.setval("port", str(port))
- self.setval("addr", "0.0.0.0")
- self.setval("saslMechanisms", "ANONYMOUS")
- self.setval("requireEncryption", False)
- self.setval("linkCapacity", 4)
- self.setval("role", "normal")
- self.setval("authenticatePeer", False)
- self.setval("host", "::")
- self.setval("identity", "listener/:::" + str(port))
- self.setval("name", self.getval("identity"))
- self.setval("maxFrameSize", 16384)
-
-class Connection(Entity):
- def __init__(self, node, id):
- super(Connection, self).__init__("connection")
- self.init(node, id)
-
- def init(self, node, id):
- if "container" not in node:
- self.setval("container", str(generate_uuid()))
- else:
- self.setval("container", node["container"])
- self.setval("opened", True)
- self.setval("name", "connection/0.0.0.0:" + str(id))
- self.setval("properties", node["properties"])
- self.setval("ssl", False)
- if "host" in node:
- self.setval("host", node["host"])
- else:
- self.setval("host", "0.0.0.0:20000")
- if "isEncrypted" not in node:
- self.setval("isEncrypted", False)
- else:
- self.setval("isEncrypted", node["isEncrypted"])
- if "user" not in node:
- self.setval("user", "anonymous")
- else:
- self.setval("user", node["user"])
- self.setval("role", node["nodeType"])
- self.setval("isAuthenticated", False)
- self.setval("identity", id)
- self.setval("dir", node["cdir"])
-
-class RouterLink(Entity):
- def __init__(self, node, identity, ldir, owningAddr, linkType, connId):
- super(RouterLink, self).__init__("router.link")
- self.init(node, identity, ldir, owningAddr, linkType, connId)
-
- def init(self, node, identity, ldir, owningAddr, linkType, connId):
- linkUuid = str(generate_uuid())
- self.setval("name", linkUuid)
- self.setval("identity", identity)
- self.setval("linkName", linkUuid)
- self.setval("linkType", linkType)
- self.setval("linkDir", ldir)
- self.setval("owningAddr", owningAddr)
- self.setval("capacity", 250)
- self.setZero(["undeliveredCount", "unsettledCount", "deliveryCount", "presettledCount", "acceptedCount",
- "rejectedCount", "releasedCount", "modifiedCount"])
- self.setval("connectionId", connId)
- self.setval("adminStatus", "enabled")
- self.setval("operStatus", "up")
-
-Schema.init()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/mock/nexthop.py
----------------------------------------------------------------------
diff --git a/console/test/mock/nexthop.py b/console/test/mock/nexthop.py
deleted file mode 100644
index 6c964c8..0000000
--- a/console/test/mock/nexthop.py
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/env python
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-import collections
-
-class TreeNode(object):
- def __init__(self, f, parent):
- self.name = f
- self.parent = parent
- self.children = []
- self.visited = False
-
- def procreate(self, links):
- if self.visited:
- return
- self.visited = True
- for link in links:
- if link['source']['nodeType'] == 'inter-router' and link['target']['nodeType'] == 'inter-router':
- if (link['source']['name'] == self.name or link['target']['name'] == self.name):
- name = link['source']['name'] if link['target']['name'] == self.name else link['target']['name']
- if not name in self.ancestors():
- self.children.append(TreeNode(name, self))
-
- def ancestors(self):
- a = self.geneology(self.parent)
- a.reverse()
- return a
-
- def geneology(self, parent):
- if parent is None:
- return []
- ret = [parent.name]
- ret.extend(self.geneology(parent.parent))
- return ret
-
-class Hopper(object):
- def __init__(self, verbose):
- self.tree = {}
- self.table = {}
- self.verbose = verbose
-
- def get(self, f, t, links):
- if self.verbose:
- print ("------- asked to get " + f + " to " + t)
- if f in self.table and t in self.table[f]:
- if self.verbose:
- print " ------- returning existing " + str(self.table[f][t])
- return self.table[f][t]
-
- self.tree = {}
- #treef = self.highest(f)
- #if treef is None:
- treef = self.root(f)
-
- q = collections.deque([treef])
- while len(q):
- node = q.popleft()
- self.process(f, node, treef.name, links)
- if f in self.table and t in self.table[f]:
- if self.verbose:
- print " ------- returning " + str(self.table[f][t])
- ret = self.table[f][t]
- #self.table = {}
- return ret
- for n in node.children:
- q.append(n)
- if self.verbose:
- print (" ------- returning unfound nextHop of None")
-
- def process(self, f, node, r, links):
- node.procreate(links)
- for n in node.children:
- self.populateTable(f, n, r)
-
- def populateTable(self, f, node, r):
- n = node.name
- if not f in self.table:
- self.table[f] = {}
- self.table[f][f] = None
- if not n in self.table:
- self.table[n] = {}
- self.table[n][n] = None
- if not node.parent:
- return
- if node.parent.name == f:
- self.table[f][n] = None
- self.table[n][f] = None
- else:
- def setHop(n, a, p):
- if not a in self.table[n]:
- self.table[n][a] = p
-
- def loop(ancestors):
- for i in range(len(ancestors)):
- start = ancestors[i]
- for j in range(i+1, len(ancestors)):
- stop = ancestors[j]
- if j-i == 1:
- setHop(start, stop, None)
- else:
- setHop(start, stop, ancestors[i+1])
-
-
- ancestors = node.ancestors()
- while len(ancestors) > 0 and ancestors[0] != r:
- ancestors.pop(0)
- ancestors.append(n)
- loop(ancestors)
- ancestors.reverse()
- loop(ancestors)
-
- def root(self, f):
- if not self.tree:
- self.tree[f] = TreeNode(f, None)
- return self.tree[list(self.tree.keys())[0]]
-
- def highest(self, f):
- r = self.root(f)
- if r.name == f:
- return r
- q = collections.deque([r])
- while len(q):
- node = q.popleft()
- for n in node.children:
- if n.name == f:
- return n
- q.append(n)
- return None
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/fe1f711e/console/test/package.json
----------------------------------------------------------------------
diff --git a/console/test/package.json b/console/test/package.json
deleted file mode 100644
index 8ba9524..0000000
--- a/console/test/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "name": "test",
- "version": "0.0.1",
- "description": "Generate test data for Apache interconnect console",
- "main": "index.js",
- "scripts": {
- "test": "echo \"Error: no test specified\" && exit 1"
- },
- "author": "Apache Qpid",
- "license": "Apache-2.0",
- "dependencies": {
- "rhea": "^0.2.12"
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org