Auto generated swagger spec/docs/protobuf/conversions

openshift · Mar 13, 2017 · c291dc7 · c291dc7
1 parent 2178bc9
commit c291dc7
Show file tree

Hide file tree

Showing 10 changed files with 121 additions and 66 deletions.
diff --git a/api/protobuf-spec/github_com_openshift_origin_pkg_sdn_api_v1.proto b/api/protobuf-spec/github_com_openshift_origin_pkg_sdn_api_v1.proto
diff --git a/api/swagger-spec/oapi-v1.json b/api/swagger-spec/oapi-v1.json
@@ -26876,13 +26876,14 @@
    "v1.EgressNetworkPolicyPeer": {
     "id": "v1.EgressNetworkPolicyPeer",
     "description": "EgressNetworkPolicyPeer specifies a target to apply egress network policy to",
-    "required": [
-     "cidrSelector"
-    ],
     "properties": {
      "cidrSelector": {
       "type": "string",
-      "description": "cidrSelector is the CIDR range to allow/deny traffic to"
+      "description": "cidrSelector is the CIDR range to allow/deny traffic to. If this is set, dnsName must be unset"
+     },
+     "dnsName": {
+      "type": "string",
+      "description": "dnsName is the domain name to allow/deny traffic to. If this is set, cidrSelector must be unset"
      }
     }
    },

diff --git a/api/swagger-spec/openshift-openapi-spec.json b/api/swagger-spec/openshift-openapi-spec.json
@@ -50430,12 +50430,13 @@
    },
    "v1.EgressNetworkPolicyPeer": {
     "description": "EgressNetworkPolicyPeer specifies a target to apply egress network policy to",
-    "required": [
-     "cidrSelector"
-    ],
     "properties": {
      "cidrSelector": {
-      "description": "cidrSelector is the CIDR range to allow/deny traffic to",
+      "description": "cidrSelector is the CIDR range to allow/deny traffic to. If this is set, dnsName must be unset",
+      "type": "string"
+     },
+     "dnsName": {
+      "description": "dnsName is the domain name to allow/deny traffic to. If this is set, cidrSelector must be unset",
       "type": "string"
      }
     }

diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go
@@ -11687,13 +11687,19 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
 				Properties: map[string]spec.Schema{
 					"cidrSelector": {
 						SchemaProps: spec.SchemaProps{
-							Description: "cidrSelector is the CIDR range to allow/deny traffic to",
+							Description: "cidrSelector is the CIDR range to allow/deny traffic to. If this is set, dnsName must be unset",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"dnsName": {
+						SchemaProps: spec.SchemaProps{
+							Description: "dnsName is the domain name to allow/deny traffic to. If this is set, cidrSelector must be unset",
 							Type:        []string{"string"},
 							Format:      "",
 						},
 					},
 				},
-				Required: []string{"cidrSelector"},
 			},
 		},
 		Dependencies: []string{},

diff --git a/pkg/sdn/api/v1/generated.pb.go b/pkg/sdn/api/v1/generated.pb.go
diff --git a/pkg/sdn/api/v1/generated.proto b/pkg/sdn/api/v1/generated.proto
diff --git a/pkg/sdn/api/v1/swagger_doc.go b/pkg/sdn/api/v1/swagger_doc.go
@@ -50,7 +50,8 @@ func (EgressNetworkPolicyList) SwaggerDoc() map[string]string {
 
 var map_EgressNetworkPolicyPeer = map[string]string{
 	"":             "EgressNetworkPolicyPeer specifies a target to apply egress network policy to",
-	"cidrSelector": "cidrSelector is the CIDR range to allow/deny traffic to",
+	"cidrSelector": "cidrSelector is the CIDR range to allow/deny traffic to. If this is set, dnsName must be unset",
+	"dnsName":      "dnsName is the domain name to allow/deny traffic to. If this is set, cidrSelector must be unset",
 }
 
 func (EgressNetworkPolicyPeer) SwaggerDoc() map[string]string {

diff --git a/pkg/sdn/api/v1/zz_generated.conversion.go b/pkg/sdn/api/v1/zz_generated.conversion.go
@@ -185,6 +185,7 @@ func Convert_api_EgressNetworkPolicyList_To_v1_EgressNetworkPolicyList(in *api.E
 
 func autoConvert_v1_EgressNetworkPolicyPeer_To_api_EgressNetworkPolicyPeer(in *EgressNetworkPolicyPeer, out *api.EgressNetworkPolicyPeer, s conversion.Scope) error {
 	out.CIDRSelector = in.CIDRSelector
+	out.DNSName = in.DNSName
 	return nil
 }
 
@@ -194,6 +195,7 @@ func Convert_v1_EgressNetworkPolicyPeer_To_api_EgressNetworkPolicyPeer(in *Egres
 
 func autoConvert_api_EgressNetworkPolicyPeer_To_v1_EgressNetworkPolicyPeer(in *api.EgressNetworkPolicyPeer, out *EgressNetworkPolicyPeer, s conversion.Scope) error {
 	out.CIDRSelector = in.CIDRSelector
+	out.DNSName = in.DNSName
 	return nil
 }
 

diff --git a/pkg/sdn/api/v1/zz_generated.deepcopy.go b/pkg/sdn/api/v1/zz_generated.deepcopy.go
@@ -111,6 +111,7 @@ func DeepCopy_v1_EgressNetworkPolicyPeer(in interface{}, out interface{}, c *con
 		in := in.(*EgressNetworkPolicyPeer)
 		out := out.(*EgressNetworkPolicyPeer)
 		out.CIDRSelector = in.CIDRSelector
+		out.DNSName = in.DNSName
 		return nil
 	}
 }

diff --git a/pkg/sdn/api/zz_generated.deepcopy.go b/pkg/sdn/api/zz_generated.deepcopy.go
@@ -111,6 +111,7 @@ func DeepCopy_api_EgressNetworkPolicyPeer(in interface{}, out interface{}, c *co
 		in := in.(*EgressNetworkPolicyPeer)
 		out := out.(*EgressNetworkPolicyPeer)
 		out.CIDRSelector = in.CIDRSelector
+		out.DNSName = in.DNSName
 		return nil
 	}
 }